]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit424e81ad9e5fa9d924ea1165a4931c28a25cbd3f
tree9304343b92b17cf1c02abb2ac61691c631d5f27c
parent4710d78e490f9915471c33dda95816d53ede45a0
parent1b130c7ceb9f035ba250a879967d8356552bb914
Merge branch 'master' into terencehill/welcome_dialog
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc