Restore old secondary force for overkill balance
[xonotic/xonotic-data.pk3dir.git] / .gitattributes
2016-06-14 MarioMerge branch 'master' into Mario/balance
2016-06-12 MarioMerge branch 'master' into Mario/showspecs
2016-04-30 MirioMerge branch 'master' into Mirio/balance
2016-03-27 terencehillMerge branch 'master' into terencehill/translate_colors_2
2016-03-26 terencehillMerge branch 'master' into terencehill/hud_fixes 294/head
2016-03-24 MarioMerge branch 'master' into Mario/hagar_notfixed
2016-03-23 terencehillMerge branch 'master' into terencehill/dynamic_hud
2016-03-22 terencehillMerge branch 'master' into terencehill/race_fix
2016-03-22 TimePathLinguist: override *.q[ch], *.inc
2013-06-10 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-05-22 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-02-08 SamualMerge remote branch 'origin/master' into samual/mutator_ctf
2012-02-04 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2012-01-25 terencehillMerge branch 'master' into terencehill/clear_button
2012-01-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/allow...
2012-01-03 SamualMerge remote branch 'origin/master' into samual/menu_up...
2011-10-23 SamualMerge remote branch 'origin/master' into samual/add_eve...
2011-10-19 Mircea KitsuneMerge branch 'master' into mirceakitsune/damage_effects
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-08-30 Rudolf PolzerMerge remote-tracking branch 'origin/morphed/casing'
2011-08-29 SamualMerge remote branch 'origin/master' into terencehill...
2011-08-28 mand1ngaMerge branch 'master' into mand1nga/bot-fixes-II
2011-08-27 Rudolf PolzerFix CRLFs
2011-07-12 SamualMerge remote branch 'origin/master' into samual/updatec...
2011-07-12 SamualMerge remote branch 'origin/master' into samual/waypoin...
2011-05-19 terencehillMerge branch 'master' into terencehill/infinite_ammo
2011-05-13 Rudolf PolzerMerge remote branch 'origin/akari/freezetag-fixes'
2011-04-20 SamualMerge remote branch 'origin/master' into samual/flyings...
2011-04-11 FruitieXMerge remote-tracking branch 'origin/master' into teren...
2011-04-09 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2011-04-03 mand1ngaMerge remote branch 'origin/morphed/hpitems'
2011-04-03 terencehillMerge branch 'master' into terencehill/newpanelhud
2011-04-01 Mircea KitsuneMerge branch 'master' into mirceakitsune/hud_postprocessing
2011-03-30 SamualMerge remote branch 'origin/master' into samual/fixes_f...
2011-03-19 SamualMerge remote branch 'origin/master' into samual/seeker_...
2011-03-19 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/physics...
2011-03-19 Rudolf PolzerMerge remote branch 'origin/terencehill/misc_bugfixes'
2011-03-15 terencehillAllow diff for tooltips.db (FINALLY!).
2011-02-02 terencehillMerge branch 'master' into terencehill/screenshot_viewer
2010-11-03 terencehillMerge remote branch 'remotes/origin/terencehill/newpane...
2010-10-22 Rudolf PolzerMerge remote branch 'refs/remotes/origin/ThePWTULN...
2010-10-21 FruitieXMerge branch 'master' into terencehill/newpanelhud...
2010-10-21 FruitieXMerge branch 'master' into terencehill/newpanelhud
2010-10-21 Rudolf PolzerMerge remote branch 'refs/remotes/origin/fruitiex/racep...
2010-10-21 Rudolf Polzernew .gitattributes file, no visible change
2010-08-13 terencehillMerge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600...
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 FruitieXMerge branch 'fruitiex/fruitbalance' of ssh://git.xonot...
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-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-21 Rudolf PolzerCRLF fixes, .gitattributes file updated
2010-07-16 terencehillMerge remote branch 'remotes/origin/terencehill/newpane...
2010-07-14 terencehillMerge remote branch 'remotes/origin/fruitiex/newpanelhu...
2010-07-09 FruitieXMerge branch 'fruitiex/newpanelhud' into fruitiex/fruit...
2010-07-04 Rudolf PolzerMerge remote branch 'refs/remotes/origin/diabolik/lodpl...
2010-06-29 Mircea KitsuneMerge branch 'master' into mirceakitsune/nex_reticle
2010-06-29 FruitieXMerge remote branch 'origin/master' into fruitiex/newpa...
2010-06-25 terencehilladd *.iqm to .gitattributes
2010-06-06 mand1ngaMerge branch 'mand1nga/rebrand' of ssh://git.xonotic...
2010-05-08 Rudolf PolzerMerge commit 'origin/master' into divVerent/tag_seeker
2010-04-26 Mircea KitsuneMerge branch 'master' into mirceakitsune/multijump
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib'
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib' into divVerent...
2010-04-22 Rudolf PolzerMerge commit '54e0ccd220df'
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib' into divVerent...
2010-04-22 Rudolf PolzerMerge branch 'master' into divVerent/bastet
2010-04-22 Rudolf PolzerMerge commit 'origin/tzork/pathlib'
2010-04-17 Rudolf Polzer.gitattributes update for IDE project files
2010-04-17 Rudolf Polzerfix lots of CRLFs
2010-04-17 Rudolf Polzer.gitattributes