[openttd-opengfx/f13/master: 2/2] Merge remote-tracking branch 'origin/master' into f13

Felix Kaechele heffer at fedoraproject.org
Tue Apr 5 14:51:52 UTC 2011


commit 391e84892312c46a64abe8b6ca811096c709c7ea
Merge: 24f836b a2de069
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Tue Apr 5 16:51:43 2011 +0200

    Merge remote-tracking branch 'origin/master' into f13

 .gitignore           |    1 +
 openttd-opengfx.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 13d0140,94bd816..083e010
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -opengfx-0.2.4-source.tar.gz
  /opengfx-0.3.1-source.tar.gz
  /opengfx-0.3.2-source.tar.gz
+ /opengfx-0.3.3-source.tar.gz


More information about the scm-commits mailing list