]> 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: 156a91f 935284a)
Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge