]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
projects / xonotic / xonotic-maps.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: d6bd6c1 9aed5e1)
Merge branch 'master' into fruitiex/epsilon divVerent/archived/fruitiex/epsilon
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 11:17:32 +0000 (13:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 11:17:32 +0000 (13:17 +0200)
commit794d87d72956446cb48af82e2730bd3f82ad2502
treeaeefdbf39ccb69c58fced90cdfcbba8a732b7c34tree | snapshot
parentd6bd6c180a6f53ccccc168b201834c63be289467commit | diff
parent9aed5e1eb47ab142a10261dfea1a95ca0d1959f3commit | diff
Merge branch 'master' into fruitiex/epsilon

Conflicts:
models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
scripts/exx.shader diff1 | diff2 | blob | history
scripts/facility114x.shader diff1 | diff2 | blob | history
scripts/trak5x.shader diff1 | diff2 | blob | history