Magne Sjaastad 9cd17ec508 Merge dev into pre-proto ... Conflicts: ApplicationCode/ProjectDataModel/RimEclipseView.cpp ApplicationCode/ProjectDataModel/RimEclipseView.h		2017-01-10 10:09:44 +01:00
..
AppFwk	Merge dev into pre-proto	2017-01-10 10:09:44 +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