]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a100395 f2b2299)
Merge branch 'master' into mirceakitsune/consumable_items mirceakitsune/consumable_items
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 16:38:46 +0000 (18:38 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 16:38:46 +0000 (18:38 +0200)
1  2 
docs/Release notes.txt patch | diff1 | diff2 | blob | history

diff --cc docs/Release notes.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.