]> 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: f990f2f f2d298b)
Merge remote branch 'origin/master' into tzork/vehicles-2
authorunknown <jakob@.(none)>
Mon, 18 Apr 2011 20:26:56 +0000 (22:26 +0200)
committerunknown <jakob@.(none)>
Mon, 18 Apr 2011 20:26:56 +0000 (22:26 +0200)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge