Merge branch 'martin-t/okc' into martin-t/okc2
[xonotic/xonotic-data.pk3dir.git] / scripts / orbs.shader
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
2011-02-02 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2011-01-25 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-12-28 Rudolf PolzerMerge remote branch 'origin/fruitiex/bots'
2010-12-15 FruitieXMerge remote branch 'origin/terencehill/newpanelhud...
2010-12-10 Rudolf PolzerMerge commit '7b4c329'
2010-12-10 Rudolf PolzerMerge remote branch 'origin/terencehill/WEP_constants_f...
2010-12-09 Rudolf PolzerMerge remote branch 'origin/terencehill/small_cleanup'
2010-12-04 terencehillMerge branch 'terencehill/newpanelhud' into terencehill...
2010-12-04 terencehillMerge branch 'master' into terencehill/crosshair_colors
2010-12-04 terencehillMerge notes, PLEASE READ:
2010-12-01 Rudolf PolzerMerge remote branch 'origin/fruitiex/cl_vyes'
2010-12-01 Rudolf PolzerMerge remote branch 'origin/samual/newsounds'
2010-12-01 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2010-11-30 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/balance'
2010-11-30 Rudolf PolzerMerge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
2010-11-30 FruitieXMerge branch 'samual/keepaway' into fruitiex/freezetag_...
2010-11-30 FruitieXMerge branch 'master' into samual/keepaway
2010-11-29 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-27 unknownMerge remote branch 'origin/master' into samual/keepaway
2010-11-27 unknownACTUALLY commit the orbs now that I fixed their origin...