Magne Sjaastad 1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/ProjectDataModel/CMakeLists_files.cmake ApplicationCode/UserInterface/RiuViewerCommands.cpp		2017-02-22 09:42:51 +01:00
..
clipper	Reorganized how clipper is included and deleted example files	2017-01-24 15:39:39 +01:00
custom-opm-common	#804 Updated opm-common based on	2016-10-13 13:40:43 +02:00
custom-opm-flowdiag-app	#1206 Updated the opm-flowdiag libraries	2017-02-09 14:14:02 +01:00
custom-opm-flowdiagnostics	#1206 Updated the opm-flowdiag libraries	2017-02-09 14:14:02 +01:00
custom-opm-parser	#804 Updated opm-parser based on	2016-10-13 13:40:44 +02:00
Ert	Reapplied fix for synthetic Odb files	2017-02-07 13:53:27 +01:00
gtest	Made the output from g-test a bit more readable	2016-10-17 15:15:27 +02:00
nightcharts	Fixed #1238 Pie chart not always complete	2017-02-21 14:44:18 +01:00
NRLib	#886 LAS Export: Set the STEP if the data is resampled	2016-09-23 10:20:05 +02:00
Qwt	Added Qwt library and basic classes for well log viewer	2015-08-26 12:27:29 +02:00