Commit Graph

3 Commits

Author SHA1 Message Date
Liu Ming
6b3b90500f Merge remote-tracking branch 'opm/master' into bo_polymer
Conflicts:
	opm/polymer/PolymerProperties.hpp
2014-10-20 13:51:37 +08:00
Roland Kaufmann
4e34a967cb Ignore output from CMake build 2013-02-22 23:34:21 +01:00
Roland Kaufmann
3d883a5aed Convert ignore file from Mercurial to Git 2012-09-12 12:55:12 +02:00