[texmakerx/f15/master: 2/2] Merge branch 'master' into f15

[hannes]

commit 967e8303e8fd96a7d98a904754d11dcb26cf27d0
Merge: 4b28c50 e5456d8
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Mon Mar 28 22:11:23 2011 +0200

    Merge branch 'master' into f15

 texmakerx.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc texmakerx.spec
index 992b7c5,05e4a39..6ba0438
--- a/texmakerx.spec
+++ b/texmakerx.spec
@@@ -1,9 -1,7 +1,9 @@@
  Name:           texmakerx
 +
  Version:        2.1
- Release:        1%{?dist}
+ Release:        2%{?dist}
  
 +
  Summary:        A feature-rich editor for LaTeX documents
  Group:          Applications/Publishing
  License:        GPLv2+ and GPLv3