OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
f9d8ab8bad
ResInsight/Fwk
History
Magne Sjaastad f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
..
AppFwk Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-16 10:18:39 +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