OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into pre-proto

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-06-20 13:26:52 +02:00
parent 5721dcdb7c 088617ea5c
commit 7c99a2573a
47 changed files with 1460 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
View File

@@ -28,7 +28,7 @@ public:
{
UNITS_METRIC,
UNITS_FIELD,
//UNITS_LAB, // Not yet
UNITS_LAB,
UNITS_UNKNOWN,
};