]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into fruitiex/cubemaps
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 29 Jul 2010 22:53:43 +0000 (01:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 29 Jul 2010 22:53:43 +0000 (01:53 +0300)
commit3a5c1471ba0f4f601874663937751180eab04cb1
tree63b2b7386c862d68e293304fd6bf9ae6135ee692
parentc203239ded8101b54d39b57750f76b31dbdfa07f
parent7fd88dce6f50bbdfcd106fe1300f4e78546eb823
Merge branch 'master' into fruitiex/cubemaps