Merge remote-tracking branch 'origin/feature/buildInstructions' into nextRelease
commit9eef2d503acc50fbbb89c68a4d9a3c1aada4540d
authorDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 11:57:09 +0000 (8 12:57 +0100)
committerDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 11:57:09 +0000 (8 12:57 +0100)
tree23b8c933eefdfda4d1e4c749846799202b23a5b6
parent2344c8c728ad85b8cbdd74c2179cacae80b8a09b
parentf42972b7ee5412796f24a9f468c734f829dc8e14
Merge remote-tracking branch 'origin/feature/buildInstructions' into nextRelease

Conflicts:
doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt
doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt
doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt
.gitignore