From: Roland Schulz <roland@utk.edu>
Date: Sun, 11 Dec 2011 20:05:19 +0000 (-0500)
Subject: Merge release-4-5-patches into release-4-6
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=13c2117e5e88c6777926e66cd31c8a3296eeca4b;p=alexxy%2Fgromacs.git

Merge release-4-5-patches into release-4-6

Conflicts:
	admin/GerritBuild.bat

Change-Id: Ib62e8f5949cc8e65342cd1826888901d11032474
---

13c2117e5e88c6777926e66cd31c8a3296eeca4b
diff --cc admin/GerritBuild.bat
index 6cd95bb362,ca1186e0eb..f603724726
--- a/admin/GerritBuild.bat
+++ b/admin/GerritBuild.bat
@@@ -3,6 -3,5 +3,4 @@@ REM Run Windows SDK SetEnv scrip
  SetEnv && ^
  cmake -G "Visual Studio 10 Win64" -D GMX_DOUBLE=%GMX_DOUBLE% -D GMX_MPI=%GMX_MPI% -D GMX_OPENMP=%GMX_OPENMP% -DGMX_DEFAULT_SUFFIX=off -DCMAKE_BUILD_TYPE=Debug . && ^
  msbuild All_Build.vcxproj && ^
- REM currently the test one example test doesn't work on Windows
- REM ctest -D ExperimentalTest -V
- 
+ ctest -D ExperimentalTest -C Debug -V
 -