Fix merge mistake when rebasing for PR #1169
authorCiaran Gultnieks <ciaran@ciarang.com>
Fri, 21 Mar 2014 20:12:13 +0000 (20:12 +0000)
committerSfan5 <sfan5@live.de>
Mon, 24 Mar 2014 18:56:36 +0000 (19:56 +0100)
commit564e11fc2f3731383cecedac8aade4dd9ecdc243
treefb34f84e7d62f18589b677d52b233ce8d8f6738d
parent5bd9c236d563f3c5a6e268abb13f291a915cde1c
Fix merge mistake when rebasing for PR #1169
src/environment.cpp