]> 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: 0720572 da809c9)
Merge remote branch 'refs/remotes/origin/fruitiex/leanmodelcfg'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 27 May 2010 20:29:09 +0000 (22:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 27 May 2010 20:29:09 +0000 (22:29 +0200)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/miscfunctions.qc
Simple merge