[knights: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/knights

[Julian Aloofi]

commit 4eda09bccc4946a935d0a710ee20f33d300608f9
Merge: 0835bd8 ec42f4f
Author: Julian Aloofi <julian.aloofi at googlemail.com>
Date:   Thu Aug 30 19:18:35 2012 +0200

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

 knights.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc knights.spec
index 214156c,29b555a..fba16d6
--- a/knights.spec
+++ b/knights.spec
@@@ -71,10 -78,9 +71,13 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 +* Thu Aug 30 2012 Julian Aloofi <julian at fedoraproject.org> 2.5.0-1
 +- update to latest upstream release
 +- remove the patch for building against the new KDEgames API
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jun 15 2012 Julian Aloofi <julian at fedoraproject.org> 2.4.2-2
  - apply patch to build against the new KDEgames API
  - removed the buildroot tag