]> 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: 24f341e fa6062c)
Merge branch 'master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 16:08:50 +0000 (17:08 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 17 Dec 2012 16:08:50 +0000 (17:08 +0100)
1  2 
qcsrc/common/util.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_weaponsystem.qc patch | diff1 | diff2 | blob | history
qcsrc/server/w_electro.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/util.qc
Simple merge
diff --cc qcsrc/server/cl_weaponsystem.qc
Simple merge
diff --cc qcsrc/server/w_electro.qc
Simple merge