Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'
[xonotic/xonotic-data.pk3dir.git] / scripts / turrets.shader
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2011-12-04 mand1ngaMerge master
2011-11-04 SamualMerge remote branch 'origin/master' into samual/updatec...
2011-10-27 Rudolf PolzerMerge remote-tracking branch 'origin/atheros/secret'
2011-10-23 SamualMerge remote branch 'origin/master' into samual/add_eve...
2011-10-18 Przemysław GrzywaczMerge commit '6f440770dbdb' into atheros/item_keys
2011-10-15 SamualMerge remote branch 'origin/master' into samual/hud_updates
2011-10-14 SamualMerge remote branch 'origin/master' into terencehill...
2011-10-14 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-10-14 SamualMerge remote branch 'origin/master' into samual/balance
2011-10-13 Jakob MGMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-10-11 Jakob MGQuick fix for missing evil_basewall/mtl_gray
2011-09-29 FruitieXMerge remote-tracking branch 'origin/master' into fruit...
2011-09-26 SamualMerge remote branch 'origin/master' into samual/hagar_s...
2011-09-25 SamualMerge remote-tracking branch 'origin/master' into samua...
2011-09-17 terencehillMerge branch 'master' into terencehill/menu_tooltips_2
2011-09-13 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/arena_...
2011-09-12 SamualMerge remote branch 'origin/divVerent/typofix'
2011-09-12 SamualMerge remote branch 'origin/master' into terencehill...
2011-09-12 SamualMerge remote branch 'origin/terencehill/megaerebus_imag...
2011-09-12 SamualMerge remote branch 'origin/terencehill/centerprint_fix'
2011-09-03 terencehillMerge branch 'master' into terencehill/it_update
2011-09-03 Rudolf Polzerfix blendfunc add use
2010-08-13 terencehillMerge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600...
2010-08-09 FruitieXMerge branch 'master' into mirceakitsune/multijump
2010-07-29 Rudolf PolzerMerge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
2010-07-29 Rudolf PolzerMerge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
2010-07-21 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/newpa...
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-18 Rudolf PolzerMerge branch 'fruitiex/fruitbalance' of ssh://git.xonot...
2010-07-18 Rudolf PolzerMerge branch 'master' into fruitiex/fruitbalance
2010-07-18 Rudolf PolzerCRLF fixes
2010-06-16 terencehillMerge remote branch 'remotes/origin/fruitiex/newpanelhu...
2010-06-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-06-06 mand1ngaMerge branch 'mand1nga/rebrand' of ssh://git.xonotic...
2010-05-18 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-05-17 FruitieXMerge branch 'master' into fruitiex/newpanelhud
2010-05-16 Sahil SinghalMerge commit 'origin/master' into diabolik/ignisplayermodel
2010-05-15 Sahil SinghalMerge commit 'origin/master' into diabolik/weaponscale
2010-05-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/diabolik/umbra...
2010-05-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/tzork/turrets'
2010-05-15 Jakob MGAdd turrets.shader
2010-03-18 Rudolf Polzermove scripts and env into the maps repo, as they really...
2010-03-18 xonoticinitial checkin from nexuiz svn r8756 initial