Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Sun, 11 Dec 2011 20:05:19 +0000 (15:05 -0500)
committerRoland Schulz <roland@utk.edu>
Sun, 11 Dec 2011 20:05:57 +0000 (15:05 -0500)
commit13c2117e5e88c6777926e66cd31c8a3296eeca4b
tree32b0b5741198bb3d15cc86aaf185d3e6e2ad1ddf
parent69c30b92221736c32728ab68fccee7a96fff3214
parentddda1303da7c5cf4327352aba2d66a0e13029276
Merge release-4-5-patches into release-4-6

Conflicts:
admin/GerritBuild.bat

Change-Id: Ib62e8f5949cc8e65342cd1826888901d11032474
CMakeLists.txt
admin/GerritBuild.bat
src/mdlib/fft5d.c