]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Sun, 8 Apr 2012 17:03:30 +0000 (19:03 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 8 Apr 2012 17:03:30 +0000 (19:03 +0200)
commit21f2d617d3cdfd37e4aa0ecc63b9359fff7ac6b0
treef8c5efc09941961d6d47adba820f3768868b92eb
parent00f75fd083e3ac717cd68f73cc8c1db3c46e8a72
parent98517678e4e82b32bcdf0bfc0dbf6fbd2513f471
Merge remote branch 'origin/master' into tzork/csqc-items
qcsrc/client/Main.qc