]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'origin/master' (early part) into fruitiex/jumppadmodel1
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:02:58 +0000 (12:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:02:58 +0000 (12:02 +0200)
commiteeac4631e2c5867eef9d1987dc647bc622457d6d
treef7d354b11dfe64245b2b743766632a6f168155da
parent098da56f8ead58029c475859f9d26d11ea6afe59
parentc9ade67954f7789b5a88589947850ee0f416abd6
Merge branch 'origin/master' (early part) into fruitiex/jumppadmodel1

Conflicts:
scripts/trak5x.shader
scripts/exx.shader
scripts/trak5x.shader