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

[hannes]

commit 4b28c50361d14d1e1571c05d7e19198075f1d3e2
Merge: bba3951 32f8a58
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Mon Mar 21 22:16:39 2011 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	texmakerx.spec
    
    Update to recent upstream

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