]> 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: feef23a 6b78702)
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 05:53:02 +0000 (07:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 05:53:02 +0000 (07:53 +0200)
1  2 
qcsrc/server/w_electro.qc patch | diff1 | diff2 | blob | history
qcsrc/server/w_laser.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/w_electro.qc
Simple merge
diff --cc qcsrc/server/w_laser.qc
Simple merge