Merge remote-tracking branch 'origin/cbrutail/newtexture-facility114inxtrim_green'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 14:17:24 +0000 (16:17 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 14:17:24 +0000 (16:17 +0200)
commit17bad329e7356d50fc2e6bd2822281e92070461a
tree5f9032845a4e1a96747adfd037ccedab5fa20c4e
parent6ed48adb69cf25ccd29ce81abf638fe2c1938de2
parentf4333900599a42e18335ce4b6bf97b7d6eca79f1
Merge remote-tracking branch 'origin/cbrutail/newtexture-facility114inxtrim_green'