[hatari/f16: 2/2] Merge branch 'master' into f16

musuruan musuruan at fedoraproject.org
Sat Jul 7 17:50:34 UTC 2012


commit a4e6a5c3c6088283feaeaf994df5c33e8a7ba47b
Merge: 1eaddcb b5553f6
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sat Jul 7 19:48:50 2012 +0200

    Merge branch 'master' into f16

 .gitignore  |    1 +
 hatari.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index e8cc629,a7563ef..5684a79
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,2 @@@
 -hatari-1.3.1.tar.bz2
 -/hatari-1.4.0.tar.bz2
 -/hatari-1.5.0.tar.bz2
 -/hatari-1.6.0.tar.bz2
  /hatari-1.6.1.tar.bz2
+ /hatari-1.6.2.tar.bz2


More information about the scm-commits mailing list