]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 438276a 38f6a93)
Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 19 Sep 2013 12:40:35 +0000 (14:40 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 19 Sep 2013 12:40:35 +0000 (14:40 +0200)
mergy mergy fixed shader


Trivial merge