[texworks: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/texworks

[cheeselee]

commit 10e6da558a7ecb2d74fac892c266403ba1678f2b
Merge: c8e15aa ee26484
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue May 8 10:33:08 2012 +0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/texworks
    
    Conflicts:
    	texworks.spec

 texworks.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc texworks.spec
index 2885246,4b7682f..e1fabc6
--- a/texworks.spec
+++ b/texworks.spec
@@@ -91,9 -91,9 +91,12 @@@ update-desktop-database &> /dev/null |
  
  
  %changelog
 +* Tue May  8 2012 Robin Lee <cheeselee at fedoraproject.org> - 0.4.4-1
 +- Update to 0.4.4 (#785100, #817511)
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Sep 19 2011 Marek Kasik <mkasik at redhat.com> - 0.4.3-3
  - Rebuild (poppler-0.17.3)