Magne Sjaastad e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/CMakeLists.txt ApplicationCode/ProjectDataModel/CMakeLists_files.cmake ApplicationCode/ProjectDataModel/RimEclipseWell.h ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake		2017-01-24 15:23:02 +01:00
..
AppFwk	Merge remote-tracking branch 'refs/remotes/origin/dev'	2017-01-24 15:23:02 +01:00
VizFwk	VizFwk : Added support for optional multiple arguments to a command line option	2016-11-09 11:30:11 +01:00
CMakeLists.txt	[Fwk] Updated headers and added unit tests, fixed minor issues related to text stream operator overload	2015-11-26 14:22:51 +01:00