Merge branch 'master' into Mario/vaporizer_damage
[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-09 Rudolf PolzerMerge remote-tracking branch 'origin/divVerent/crypto...
2015-01-24 terencehillMerge branch 'master' into terencehill/menu_optimizations
2015-01-23 MarioMerge branch 'terencehill/cvar_updates' into 'master'
2015-01-22 MarioMerge branch 'master' into sev/hud_kh
2015-01-20 MarioMerge branch 'master' into Mario/vaporizer_damage
2015-01-19 MarioMerge remote-tracking branch 'origin/master' into sev...
2015-01-18 MarioMerge branch 'terencehill/music_player' into 'master'
2015-01-13 Rudolf PolzerTransifex sync. xonotic-v0.8.0
2015-01-11 Rudolf PolzerMerge branch 'terencehill/teams_override_cvars' into...
2015-01-11 Rudolf PolzerMerge branch 'sev/luma_supplement' into 'master'
2015-01-11 Rudolf PolzerMerge branch 'sev/scoreboard_skin' into 'master'
2015-01-11 Rudolf PolzerMerge branch 'terencehill/eliminatedplayer_fix' into...
2015-01-11 Rudolf PolzerMerge branch 'terencehill/keybinds.txt.it_update' into...
2015-01-11 Rudolf PolzerMerge remote-tracking branch 'origin/mrbougo/clonefixes'
2015-01-11 Rudolf PolzerWelcome, Asturian, to the languages list!
2015-01-09 Rudolf PolzerAnother transifex sync.
2015-01-06 Rudolf PolzerAuto transifex sync ;)
2015-01-05 Rudolf PolzerAuto transifex sync ;)
2015-01-05 MarioMerge branch 'Mirio/credits' into 'master'
2015-01-04 Rudolf PolzerAuto transifex sync ;)
2015-01-04 Rudolf PolzerAuto transifex sync test ;)
2015-01-03 Rudolf PolzerTransifex merge. Now with 100% Russian!
2015-01-02 Severin MeyerMerge branch 'master' into sev/luma
2014-12-31 Rudolf PolzerTransifex sync.
2014-12-31 Rudolf PolzerAll in all it's just a-nother transifex sync.
2014-12-30 terencehillMerge branch 'master' into terencehill/music_player
2014-12-30 Rudolf PolzerAnother transifex sync :)
2014-12-30 Rudolf PolzerMore transifex sync.
2014-12-30 Rudolf PolzerTransifex merge.
2014-12-25 Rudolf PolzerMerge branch 'sev/menu_charmap' into 'master'
2014-12-25 MarioMerge branch 'master' into terencehill/music_player
2014-12-25 MarioMerge branch 'TimePath/issues/1428' into 'master'
2014-12-24 MarioMerge branch 'TimePath/features/jetpack_jump' into...
2014-12-21 Rudolf PolzerSync from/to transifex.
2014-12-20 MarioMerge branch 'master' into Mario/notifications
2014-12-17 TimePathMerge branch 'master' into terencehill/music_player
2014-12-13 MarioMerge branch 'master' into mirceakitsune/player_cubemaps
2014-12-13 Mario(Untested) Merge branch 'master' into Mario/overkill
2014-11-22 MarioMerge branch 'master' into terencehill/verbose_notifica...
2014-11-18 MarioMerge branch 'master' into sev/luma
2014-11-17 MarioMerge branch 'master' into samual/combined_updates
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-10-19 terencehillMerge branch 'master' into terencehill/ca_fixes
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-20 MarioMerge branch 'master' into Mario/overkill
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-19 terencehillMerge branch 'master' into terencehill/ca_fixes
2014-02-17 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-16 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/overkill
2014-01-28 MarioMerge branch 'master' into Mario/nade_drop
2014-01-25 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-24 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-23 MarioMerge branch 'master' into terencehill/music_player
2013-12-06 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-11-26 Samual LenksMerge remote-tracking branch 'origin/zykure/playerstats...
2013-10-23 MarioMerge branch 'master' into Mario/notifications
2013-10-22 MarioMerge branch 'master' into Mario/respawn_delays
2013-10-13 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-10-12 MarioMerge branch 'master' into Mario/monsters
2013-10-11 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
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 'Mario/spawnsystem_mutator' into Mario...
2013-10-07 MarioMerge branch 'master' into Mario/csqc_models
next