]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/world_cubemaps
authorRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
commitead3a9d3331da4d9e93222970912cc11f0f1043d
tree62fbf304aa13cbe0311ed4b9224af330f85566cb
parenta9f168ef698b42f8a93d6d9e5240933727d62e67
parentfb4b0e3abb8191950b0d64a00e91a7cc0d8ce7fd
Merge branch 'master' into mirceakitsune/world_cubemaps