Merge branch 'master' into samual/combined_updates
authornyov <nyov@nexnode.net>
Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
committernyov <nyov@nexnode.net>
Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
commitd9b5f3d1a9c73003eb046909ffb9832d46505ed7
treed0a9afd43ad52204b6bb6b4875e5d56add6c1e5d
parent5e3a7beca384caa6f3da36fe07b29aff942e7b3e
parentaf818d85ab5246b8ecd1743ecf808d39e4396445
Merge branch 'master' into samual/combined_updates
qcsrc/common/util.qc
qcsrc/common/util.qh