]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/history - .tx
Merge branch 'master' into sev/luma
[xonotic/xonotic-data.pk3dir.git] / .tx /
2014-11-18 MarioMerge branch 'master' into sev/luma
2014-11-13 MarioMerge branch 'master' into Mario/domination_roundbased
2014-11-13 MarioMerge branch 'master' into Mario/nade_updates
2014-11-04 MarioMerge branch 'master' into Mario/buffs
2014-09-25 Rudolf PolzerMerge branch 'master' into samual/weapons
2014-06-15 MarioMerge remote-tracking branch 'remotes/origin/Mario...
2014-06-15 MarioMerge branch 'master' into Mario/weapons
2014-06-11 MarioApply a patch by Melanosuchus, fixing issues noted...
2014-06-04 MarioMerge branch 'master' into Mario/race_cts_mutators
2014-06-04 MarioMerge branch 'master' into Mario/mutators2
2014-06-04 Rudolf PolzerAnother transifex sync.
2014-06-04 Rudolf PolzerTransifex sync.
2014-06-04 Rudolf PolzerMerge remote-tracking branch 'origin/Mario/hook_refire'
2014-06-04 Rudolf PolzerMerge remote-tracking branch 'origin/Mario/teamswitch_fix2'
2014-06-04 Rudolf PolzerMerge remote-tracking branch 'origin/Mario/name_colors'
2014-03-01 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/train_fix'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/terencehill/hud_co...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/teams_override'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/nade_drop'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/Mario/spawnsystem_...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/sev/waypointarrow'
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/terencehill/hud_fixes'
2014-02-17 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-14 Rudolf PolzerFinally merged them all.
2014-02-14 Rudolf PolzerMore transifex.
2014-02-14 Rudolf PolzerTransifex merge.
2014-01-30 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2014-01-30 terencehillMerge branch 'master' into terencehill/hud_fixes
2014-01-28 MarioMerge branch 'master' into Mario/spawnsystem_mutator
2014-01-28 MarioMerge branch 'master' into Mario/nade_drop
2014-01-25 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-18 Rudolf PolzerMerge branch 'master' of git://nl.git.xonotic.org/xonot...
2014-01-18 Rudolf PolzerMore Transifex.
2014-01-06 Rudolf PolzerMerge branch 'master' of git://nl.git.xonotic.org/xonot...
2014-01-06 terencehillMerge branch 'master' into terencehill/hud_code_cleanup
2014-01-05 terencehillMerge branch 'master' into terencehill/ca_ft_fixes
2014-01-04 terencehillMerge branch 'master' into terencehill/vehicles_fixes
2014-01-01 Rudolf Polzertransifex
2013-12-29 Samual LenksMerge remote-tracking branch 'origin/terencehill/color_...
2013-12-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-12-06 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-22 MarioMerge branch 'master' into Mario/respawn_delays
2013-10-12 MarioMerge branch 'master' into Mario/monsters
2013-10-11 Rudolf PolzerMerge remote-tracking branch 'origin/mirceakitsune...
2013-10-11 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/quickfix...
2013-10-07 MarioMerge branch 'master' into Mario/csqc_models
2013-10-06 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-04 Rudolf PolzerMerge with transifex.
2013-10-04 Rudolf PolzerOops. Why wasn't merge-base updated...
2013-10-01 MarioMerge branch 'master' into Mario/spawnsystem_mutator
2013-10-01 MarioMerge branch 'master' into Mario/respawn_delays
2013-09-23 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/noautoma...
2013-09-17 Rudolf PolzerMerge branch 'master' into divVerent/desktopfullscreen
2013-09-16 terencehillMerge branch 'master' into terencehill/ca_ft_fixes
2013-09-15 terencehillMerge branch 'master' into terencehill/vehicles_fixes
2013-09-15 MarioMerge branch 'master' into Mario/monsters
2013-09-14 Samual LenksMerge remote-tracking branch 'origin/debugger/dualscree...
2013-09-14 Samual LenksMerge remote-tracking branch 'origin/Mario/yet_another_...
2013-09-14 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-09-14 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-09-13 Rudolf Polzertransifex import
2013-09-13 Rudolf PolzerNicer merging.
2013-09-13 Rudolf PolzerImport from transifex.
2013-09-13 Rudolf PolzerIntegrate with Transifex.