Squashed commit of the following:
[xonotic/xonotic-maps.pk3dir.git] / scripts / facility114x.shader
2010-10-02 FruitieXMerge remote branch 'origin/divVerent/fruitiex-textures...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-10-02 Rudolf Polzeradd basepurple to facility114x
2010-09-28 Rudolf PolzerMerge commit 'c87167c'
2010-09-28 Rudolf PolzerMerge branch 'master' into divVerent/archived/fruitiex...
2010-09-25 Rudolf PolzerMerge branch 'master' into cbrutail/shaders_fx_xonotic2
2010-09-25 Rudolf PolzerMerge branch 'master' into fruitiex/runningmanctf
2010-08-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/warpzone'
2010-08-24 Rudolf PolzerMerge remote branch 'origin/fruitiex/lightshaders'
2010-08-24 Rudolf PolzerMerge remote branch 'refs/remotes/origin/diabolik/facil...
2010-08-24 Sahil SinghalMerge remote branch 'origin/master' into diabolik/facil...
2010-08-24 Sahil SinghalFinish misc and wall.
2010-08-24 Sahil SinghalCeiling and trim. Need to finish wall and misc.
2010-07-24 FruitieXMerge branch 'fruitiex/runningmanctf' of ssh://git...
2010-07-21 Rudolf PolzerMerge remote branch 'origin/master' into fruitiex/warpzone
2010-07-21 Rudolf PolzerMerge remote branch 'origin/master' into m0rfar/heaven
2010-07-21 Rudolf PolzerMerge remote branch 'origin/master' into fruitiex/runni...
2010-07-21 Rudolf PolzerMerge remote branch 'origin/master' into cbrutail/shade...
2010-07-18 Rudolf PolzerCRLF fixes
2010-05-08 Rudolf PolzerMerge commit 'origin/master' into divVerent/tag_seeker
2010-05-08 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/gravity_trigger'
2010-05-06 Rudolf PolzerMerge remote branch 'origin/tzork/facility114x'
2010-04-28 Jakob MGAdd Oblivion's facility114 textureset