]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa22507 6153804)
Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge