]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc5c35c 1e80ce5)
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 14 Feb 2011 16:08:51 +0000 (18:08 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 14 Feb 2011 16:08:51 +0000 (18:08 +0200)
1  2 
qcsrc/common/items.qh patch | diff1 | diff2 | blob | history
qcsrc/server/w_crylink.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/items.qh
Simple merge
diff --cc qcsrc/server/w_crylink.qc
Simple merge