]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f2d3db 32d968a)
Merge branch 'samual/menu_updates' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Jan 2012 21:47:51 +0000 (22:47 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Jan 2012 21:47:51 +0000 (22:47 +0100)

Trivial merge