]> 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: 234777b 2b17138)
Merge branch 'fruitiex/jumppadmodel1' into fruitiex/epsilon
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 12:58:45 +0000 (15:58 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 12:58:45 +0000 (15:58 +0300)
Conflicts:
scripts/exx.shader
scripts/trak5x.shader

1  2 
scripts/exx.shader patch | diff1 | diff2 | blob | history

diff --cc scripts/exx.shader
Simple merge