]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da06374 63e7ba9)
Merge branch 'master' into mirceakitsune/health_size
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 May 2011 17:09:39 +0000 (20:09 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 May 2011 17:09:39 +0000 (20:09 +0300)
1  2 
data/defaultVT.cfg patch | diff1 | diff2 | blob | history
data/qcsrc/server/vore.qc patch | diff1 | diff2 | blob | history

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