Merge branch 'master' into terencehill/clear_button
[xonotic/xonotic-data.pk3dir.git] / Makefile
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/waypoint...
2012-01-07 SamualMerge remote branch 'origin/master' into mirceakitsune...
2012-01-05 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
2012-01-05 Rudolf Polzerrename to check-cvars
2011-12-04 mand1ngaMerge master
2011-10-23 SamualMerge remote branch 'origin/master' into samual/add_eve...
2011-10-19 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
2011-10-03 terencehillMerge branch 'master' into terencehill/maximized_radar
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-13 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/less_s...
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-11 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2011-09-10 Rudolf Polzersplit Makefile into two for more convenient source...
2011-07-26 Rudolf PolzerMerge remote branch 'origin/mirceakitsune/fix_antilag_t...
2011-07-12 SamualMerge remote branch 'origin/master' into samual/updatec...
2011-07-12 SamualMerge remote branch 'origin/master' into samual/waypoin...
2011-06-13 Jakob MGGet rid of TNSF_FAR, short is good enougth. Hide server...
2011-05-19 terencehillMerge branch 'master' into terencehill/infinite_ammo
2011-05-18 Jakob MGNew spider hud
2011-05-17 FruitieXMerge remote-tracking branch 'origin/master' into fruit...
2011-05-14 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/fexists'
2011-05-14 Rudolf PolzerMerge remote-tracking branch 'origin/terencehill/big_cl...
2011-05-13 Rudolf PolzerMerge remote branch 'origin/akari/freezetag-fixes'
2011-05-10 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
2011-05-01 mand1ngaMerge remote-tracking branch 'origin/fruitiex/fix_slap'
2011-05-01 terencehillMerge branch 'master' into terencehill/newpanelhud
2011-05-01 Mircea KitsuneMerge branch 'mirceakitsune/hud_postprocessing' of...
2011-05-01 Mircea KitsuneMerge branch 'master' into mirceakitsune/hud_postprocessing
2011-05-01 Mircea KitsuneMerge branch 'mirceakitsune/weapon_hagar_secondary_load...
2011-05-01 Mircea KitsuneMerge branch 'master' into mirceakitsune/weapon_hagar_s...
2011-05-01 FruitieXMerge remote-tracking branch 'origin/master' into fruit...
2011-04-30 terencehillMerge branch 'master' into terencehill/italian_update
2011-04-29 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/relics...
2011-04-29 SamualMerge branch 'mirceakitsune/event_chasecam' of ssh...
2011-04-29 SamualMerge remote branch 'origin/master' into mirceakitsune...
2011-04-29 SamualMerge remote branch 'origin/master' into samual/flyings...
2011-04-28 Rudolf Polzerremove the ^1 from the watermark
2011-03-01 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/tooltips_fix'
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-12 SamualMerge remote branch 'origin/master' into samual/keepaway
2010-12-10 Rudolf PolzerMerge commit '7b4c329'
2010-12-10 Rudolf PolzerMerge remote branch 'origin/terencehill/WEP_constants_f...
2010-12-10 terencehillMerge branch 'terencehill/newpanelhud' into terencehill...
2010-12-09 Rudolf PolzerMerge remote branch 'origin/terencehill/small_cleanup'
2010-12-09 Rudolf PolzerMerge remote branch 'origin/mand1nga/bots/weapons-fixes'
2010-12-09 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-12-06 Rudolf PolzerMerge branch 'master' of git://git.xonotic.org/xonotic...
2010-12-06 Rudolf PolzerMerge remote branch 'origin/terencehill/crosshair_colors'
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-04 Rudolf Polzertemporary hack: a cvar "popcon" - transmits info to...
2010-12-03 Rudolf Polzertry a possibly better way to identify changed files...
2010-11-14 FruitieXMerge branch 'master' into fruitiex/dryfirefix
2010-11-07 Rudolf PolzerMerge remote branch 'origin/fruitiex/nexballtextures'
2010-11-07 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-11-05 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-11-03 Rudolf PolzerMerge remote branch 'origin/fruitiex/fruitbalance'
2010-11-03 Rudolf Polzerget -Werror back
2010-11-03 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/racef...
2010-11-01 terencehillMerge branch 'master' into terencehill/crosshair_fix
2010-10-31 Rudolf Polzerenable logicops in a better place (so it works for...
2010-10-31 terencehillMerge branch 'master' into terencehill/newpanelhud
2010-10-28 FruitieXMerge remote branch 'origin/master' into fruitiex/fruit...
2010-10-27 Rudolf Polzerwe can get rid of the "hanging ;" warning by calling...
2010-10-27 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2010-10-26 Rudolf Polzerdisable -Werror for now
2010-10-26 Rudolf Polzerfix some warnings in HUD code
2010-10-26 Rudolf Polzerbe more strict with warnings (csqc now no longer compiles)
2010-10-22 Rudolf PolzerMerge remote branch 'refs/remotes/origin/ThePWTULN...
2010-10-21 FruitieXMerge branch 'master' into terencehill/newpanelhud
2010-10-20 terencehillMerge branch 'master' into terencehill/newpanelhud...
2010-10-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/tzork/turrets'
2010-10-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/mirceakitsune...
2010-10-16 Rudolf PolzerMerge remote branch 'origin/tzork/turrets'
2010-10-15 Rudolf Polzerfix the filtering out .dat
2010-10-15 Rudolf Polzerproper detection of changed source files in the QC...
2010-09-28 Jakob MGMerge branch 'tzork/ents-onoff' of ssh://git.xonotic...
2010-09-28 Jakob MGMerge branch 'master' into tzork/ents-onoff
2010-08-31 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/newpa...
2010-08-19 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-08-15 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/newpa...
2010-08-15 Rudolf Polzerremove lots of useless Nexuiz junk from the makefile
2010-08-15 FruitieXMerge remote branch 'origin/master' into fruitiex/newpa...
2010-08-13 terencehillMerge branch 'master' into terencehill/newpanelhud...
2010-08-13 terencehillMerge branch 'master' into terencehill/misc_bugfixes
2010-08-09 FruitieXMerge branch 'master' into mirceakitsune/multijump
2010-08-08 Rudolf PolzerMerge remote branch 'refs/remotes/origin/terencehill...
2010-08-06 Rudolf PolzerMerge branch 'master' of ssh://git.xonotic.org/xonotic...
next