]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d969f2 29f2140)
Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 20 Feb 2012 12:09:20 +0000 (13:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 20 Feb 2012 12:09:20 +0000 (13:09 +0100)
Conflicts:
misc/tools/xonotic-map-compiler-autobuild


Trivial merge