]> 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: 01e2dd8 55f8742)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 6 May 2013 21:44:53 +0000 (07:44 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 6 May 2013 21:44:53 +0000 (07:44 +1000)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge