]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
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)
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

1  2 
scripts/exx.shader
scripts/facility114x.shader
scripts/trak5x.shader

Simple merge
Simple merge
Simple merge