]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge commit 'origin/esteel/ignore'
authorRudolf Polzer <rpolzer@grawp.(none)>
Sun, 11 Apr 2010 18:12:33 +0000 (20:12 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Sun, 11 Apr 2010 18:12:33 +0000 (20:12 +0200)
commit52ce8712d7467c8e6f5b168aa015bf26835463d1
tree33e86985a4893a6940f7af61ce5cd811ebd5e4f3
parentc95e83cbb6deb363d647188fc8b4903195fe2981
parent410a6100700bbf40044db8ce22cd2d8b4abc83a3
Merge commit 'origin/esteel/ignore'