]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d0b168 91f7033)
Merge branch 'master' into mirceakitsune/firing_buttons
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Jul 2011 13:29:05 +0000 (16:29 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Jul 2011 13:29:05 +0000 (16:29 +0300)
1  2 
data/defaultVT.cfg patch | diff1 | diff2 | blob | history

diff --cc data/defaultVT.cfg
Simple merge
Unnamed repository; edit this file 'description' to name the repository.