The following commit has been merged in the master branch:
commit 6830154f8817901dfa016b68ac4a8c2b8d02da6c
Merge: 385ff96082a708481ef2e7b9d887f8c0f38bd609 
559e278bb862b9b7f4ed6ef9d976db976b78b84b
Author: Gonéri Le Bouder <gon...@rulezlan.org>
Date:   Wed Jul 29 19:43:28 2009 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/irrlicht
    
    Conflicts:
        debian/changelog
        debian/rules

diff --combined debian/changelog
index cb5c3d2,362eb50..0dc61c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,9 @@@
- irrlicht (1.5+repack1-1) unstable; urgency=low
+ irrlicht (1.5+dfsg1-1) unstable; urgency=low
  
 +  [ Christoph Egger ]
    * Initial release (Closes: #397255)
 -  * TODO: (raph...@irc)
 -    * Convert chm to more suitable format
 -    * some more work concerning sonames
  
 - -- Christoph Egger <deb...@christoph-egger.org>  Fri, 10 Apr 2009 11:30:21 
+0200
 +  [ Gonéri Le Bouder ]
 +  * clean the tarball up
 +
 + -- Gonéri Le Bouder <gon...@rulezlan.org>  Wed, 29 Jul 2009 19:27:54 +0200

-- 
Packaging the irrlicht game engine

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to