]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4710d78 1b130c7)
Merge branch 'master' into terencehill/welcome_dialog
authorterencehill <piuntn@gmail.com>
Mon, 2 Sep 2013 10:30:57 +0000 (12:30 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 2 Sep 2013 10:30:57 +0000 (12:30 +0200)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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