The following commit has been merged in the master branch:
commit a3591060bee4204da8f37f3c4c36ccf84b0c0084
Merge: b6408caabec337c06bcdfe3725e060353a5c0724
13aef5d62dbbae765dcee6612636b84857791dac
Author: Felix Geyer <[email protected]>
Date: Thu Aug 4 11:30:20 2011 +0200
Merge commit 'upstream/0.6.1'
Conflicts:
.gitignore
--
Packaging for teeworlds
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
