Merge "Add CMakeLists.txt.user to gitignore" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Thu, 20 Oct 2011 12:10:18 +0000 (14:10 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 20 Oct 2011 12:10:18 +0000 (14:10 +0200)
commite647f74a40a13e09e6a7bb049a47d13b76a15153
treeec78d06d846c60016fa31c4ffc34111c920b2d09
parentfe942ca25df4a2a46c17887933d88bc9a787d712
parent0fe2dd707ab7a04aeec817273498a027774d0e1f
Merge "Add CMakeLists.txt.user to gitignore" into release-4-6