]> 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: 6272c42 4d1b7ce)
Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 16:01:58 +0000 (19:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 16:01:58 +0000 (19:01 +0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/progs.src patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/progs.src
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge