]> git.xonotic.org Git - xonotic/xonotic.git/commit
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)
commitdf785acadc96e0bb2d5d532a5fd2222ea9c55e06
treee42b47497cde9664effd41ecf2e53093ca9e9425
parent5d969f2992f95cd6e062c2d514eb533f6176559e
parent29f2140b7a85cb0d7033f3705c5e0d3fc283bfe3
Merge branch 'master' of /var/cache/git/xonotic/xonotic

Conflicts:
misc/tools/xonotic-map-compiler-autobuild