]> 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: 0ea6767 aa4c896)
Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:04 +0000 (16:56 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:04 +0000 (16:56 +0200)
Conflicts:
qcsrc/common/util.qc

I didn't merge directly master as I get this error:
too many files (created: 234 deleted: 1239), skipping inexact rename detection
I _HOPE_ the next merge won't fail...


Trivial merge