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)
commit0c6fc307c63947463f12d20b1774b714b54d846f
tree996414a881ed8b5b6b88a45bbf90c0f7b63b3ec6
parent0ea67677132d4f558b711d75d06640bfb87f8f81
parentaa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600
Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes

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...