]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 012a8a2) | patch
fix some merge conflicts in this cbp file, whatever that is. This may work, or may...
authorRudolf Polzer <divverent@xonotic.org>
Wed, 27 Jul 2011 17:56:09 +0000 (19:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 27 Jul 2011 17:56:09 +0000 (19:56 +0200)
commit0bc0a9c47261b77ba1dae24c2116f361c0f7cf71
treede663ad86556a6094c1f9ffc79c350e408d1f18btree | snapshot
parent012a8a2cdfede104ec34b9879521ffb749a29afecommit | diff
fix some merge conflicts in this cbp file, whatever that is. This may work, or may not.
qcsrc/qc-client.cbp diff | blob | history