]> 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: 14d7329 ad4d291)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 14 Jun 2013 03:03:54 +0000 (13:03 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 14 Jun 2013 03:03:54 +0000 (13:03 +1000)
1  2 
qcsrc/client/progs.src patch | diff1 | diff2 | blob | history
qcsrc/server/progs.src patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/progs.src
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge