Merge remote-tracking branch 'origin/BUGFIX/adjustedMakeScripts'
commitb3bc82bb4414069565fe258e4640c97abf9c85d4
authorDominik Christ <d.christ@wikki.co.uk>
Mon, 17 Feb 2014 16:34:24 +0000 (17 16:34 +0000)
committerDominik Christ <d.christ@wikki.co.uk>
Mon, 17 Feb 2014 16:34:24 +0000 (17 16:34 +0000)
tree0cbbf9d48c9b0365588aa95b74361b2bad7480b8
parent55a148542db5e4a243eed8340a86a084e1c31373
parente50d7c4dcc19f279f962286574975fc293cc2e34
Merge remote-tracking branch 'origin/BUGFIX/adjustedMakeScripts'
etc/settings.sh