]> 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: 4d579d7 cd65914)
Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 12:48:08 +0000 (15:48 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 12:48:08 +0000 (15:48 +0300)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/w_electro.qc patch | diff1 | diff2 | blob | history
qcsrc/server/w_grenadelauncher.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/w_electro.qc
Simple merge
diff --cc qcsrc/server/w_grenadelauncher.qc
Simple merge