]> 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: 06c11de 46c4e79)
Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 2 Jun 2010 10:09:15 +0000 (13:09 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 2 Jun 2010 10:09:15 +0000 (13:09 +0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

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