Merge branch 'release-4-6'
authorRoland Schulz <roland@utk.edu>
Wed, 17 Oct 2012 03:34:06 +0000 (23:34 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 17 Oct 2012 03:34:06 +0000 (23:34 -0400)
commit4d02eb4db252e4e001996306d4adb6fd852834a0
tree9adfb74d4e5de4b8af28d08b0830e681bf2906fd
parente56dd547c0a226c5ba05e95e810ee9ec9f93d3ab
parent646b9b09a41d81dca63fbde47907fc556ba4b86f
Merge branch 'release-4-6'

Conflicts:
src/gromacs/mdlib/pme.c (trivial)

This merge reverts
1) Fixed install-xxx functionality broken in 9628e27d
   b64eea399c18e345204c4aee79984cba2819dbd8
   Because 9628e27d was already reverted and we need to do this
   seperate in master
2) Make Gromacs compile without C++ compiler
   cb93f945a96caad2b9041b6b64d5c5bd872dc78f
   Doesn't apply to master

Change-Id: I12f455ee654f0fa9e45e27fe056b98399ff4584b
src/gromacs/legacyheaders/types/hw_info.h
src/gromacs/legacyheaders/types/ifunc.h
src/gromacs/mdlib/clincs.c
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/pme.c
src/programs/mdrun/repl_ex.c
src/tools/gmx_tune_pme.c