Magne Sjaastad 6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake

2017-02-03 10:51:46 +01:00

..

AppFwk

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-03 10:51:46 +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