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

[hannes]

commit d169b536e7834fcd49847bce884a3b90291c61f2
Merge: 967e830 ac5e8f6
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Sat Apr 2 10:06:08 2011 +0200

    Merge branch 'master' into f15

 texmakerx-2.1-svn.patch |   10 ++++++++++
 texmakerx.spec          |   10 +++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --cc texmakerx.spec
index 6ba0438,64dfc31..24f7839
--- a/texmakerx.spec
+++ b/texmakerx.spec
@@@ -1,9 -1,7 +1,9 @@@
  Name:           texmakerx
 +
  Version:        2.1
- Release:        2%{?dist}
+ Release:        3%{?dist}
  
 +
  Summary:        A feature-rich editor for LaTeX documents
  Group:          Applications/Publishing
  License:        GPLv2+ and GPLv3