Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 15 Sep 2015 20:09:22 +0000 (22:09 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 15 Sep 2015 20:09:22 +0000 (22:09 +0200)
commit8b54380895288f800b992058959022887de4ea3f
tree515c28b91c5b058bc01903f39bb516ffbd3b4b04
parentfa4062f85ced0549098c291652ec2a3ef8e1118f
parent4dd6716e2191896c0577608081414509e41ee07c
Merge branch release-5-1

Conflicts:
src/gromacs/timing/wallcycle.cpp

Trivial conflicts from C++ conversion

Change-Id: I99977188dd3308b329c7cc3697c795c4fd0198cb
cmake/FindSphinx.cmake
src/gromacs/domdec/domdec.cpp
src/gromacs/timing/wallcycle.cpp