]> 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: 612efe6 c63c0ab)
Merge branch 'master' into samual/change_default_balance
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)
1  2 
effectinfo.txt patch | diff1 | diff2 | blob | history
qcsrc/server/w_crylink.qc patch | diff1 | diff2 | blob | history

diff --cc effectinfo.txt
Simple merge
diff --cc qcsrc/server/w_crylink.qc
Simple merge