OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,844 Commits 27 Branches 61 Tags 309 MiB
13df0d33b9
Commit Graph

101 Commits

Author SHA1 Message Date
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
9a11949f67 Updated opm-flowdiagnostics-applications to SHA afd3f6c454f52dcfa0a6aa96be9823176a6daa48 2017-03-31 15:13:50 +02:00
Jacob Støren
a23d6a7ebc Upped version to 2016.11-flow.12 after Sprint 12 2017-03-30 10:23:55 +02:00
Magne Sjaastad
70eeac9536 Upped to version 2016.11.flow.11 2017-03-16 08:39:11 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Jacob Støren
ba2e4ca3f2 #1269 Updated opm-flowdiagnostics to a14dc4ba1302bcc1e0aeb35c5de6b4bd39bce98a to fix issue with fraction sums > 1.0 2017-03-03 15:07:26 +01:00
Magne Sjaastad
914a2d9016 Upped to pre-proto.10 2017-03-02 11:47:26 +01:00
Jacob Støren
b8c2c8e943 Upped to version 2016.11.flow.9 2017-03-01 16:18:46 +01:00
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
Jacob Støren
8596c3f79c #1206 Updated the opm-flowdiag libraries 2017-02-09 14:14:02 +01:00
Magne Sjaastad
e21d904b69 Upped to version 2016.11.pre-proto.9 2017-02-09 07:02:20 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
fd832c65d9 Updated reference to ERT GitHub SHA 2017-02-07 13:55:33 +01:00
Jacob Støren
8a26861c03 Version set to 2016.11.flow.8 for finalizing sprint 8 2017-02-03 09:31:27 +01:00
Magne Sjaastad
082960d887 Updated to pre-proto.7 2017-01-10 10:13:34 +01:00
Jacob Støren
5ffb1daeca Upped to version 2016.11.flow.7 2017-01-10 08:56:07 +01:00
Jacob Støren
95206315fa opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b 
opm-flowdiagnostics-applications updated to 01ecb8fc22cb70d883edaad398bffc49878859c3
Which fixes error in TOF calculations.
 2017-01-05 14:57:25 +01:00
Magne Sjaastad
6b9775fb14 System : Set version info to flow.1 2016-12-07 11:43:04 +01:00
Magne Sjaastad
b30432cfde #1014 System : Use RESINSIGHT_INCREMENT_VERSION 2016-12-07 11:34:40 +01:00
Magne Sjaastad
10ddf1eccc #1014 System : Use RESINSIGHT_MAJOR_VERSION and RESINSIGHT_MINOR_VERSION 2016-11-30 17:36:22 +01:00
Magne Sjaastad
61ba5c2ca1 System : Update version number after release 2016-11-29 14:18:49 +01:00
Magne Sjaastad
1a636a8e20 #832 : Updated version to 2016.11.0 2016-11-29 09:51:48 +01:00
Jacob Støren
11e3ee418c Upped to 1.6.10-dev final testing 2016-11-28 10:21:53 +01:00
Magne Sjaastad
d1f4eab455 #996 Updated reference to ERT GitHub SHA 2016-11-23 07:33:20 +01:00
Magne Sjaastad
b6f6f6e3ee Upped to 1.6.9-dev 2016-11-15 08:57:15 +01:00
Magne Sjaastad
7f293a5257 Upped to 1.6.8-dev 2016-11-03 10:08:45 +01:00
Jacob Støren
12c572e27a Upped to 1.6.7-gm-beta for release of the intermediate version used in the Geomech Well Related project. 2016-11-02 17:17:14 +01:00
Jacob Støren
c869492de2 Upped to version 1.6.6-dev after Sprint 4 Geom Well Related 2016-10-24 09:41:51 +02:00
Magne Sjaastad
1cbea760a7 #804 Updated sha references 2016-10-13 13:55:32 +02:00
Jacob Støren
94f47aecaa Upped to version 1.6.5-dev at completion of Geom Well Rel Sprint 3 2016-10-06 08:54:21 +02:00
Jacob Støren
07116c3bf6 Upped to version 1.6.4-dev after Sprint 2 - Geomech Well Related 2016-09-22 08:53:51 +02:00
Jacob Støren
8c67ee0a0d Upped to 1.6.3-dev concluding Sprint 1 of Geom Well Related 2016-09-06 15:54:37 +02:00
Jacob Støren
d4bb4011bd Upped version to 1.6.2-dev after sprint 2 (and some) 2016-06-21 19:37:20 +02:00
Magne Sjaastad
6e52a4101a Updated to 1.6.1-dev after relase of 1.6.0 2016-01-11 13:40:58 +01:00
Magne Sjaastad
4476e60816 Set version number to 1.6.0 for release 2016-01-11 09:23:09 +01:00
Jacob Støren
f7d5d92029 Upped to version 1.5.111-RC after fixing #712 2016-01-10 21:39:30 +01:00
Jacob Støren
cc9f20e912 Upped to version 1.5.110-RC 2016-01-07 14:25:40 +01:00
Magne Sjaastad
72459a339f Upped to 1.5.109-RC 2015-12-17 14:51:16 +01:00
Jacob Støren
fc7721dc20 Upped to 1.5.108-RC after fixing #709 2015-12-15 14:02:27 +01:00
Jacob Støren
6267f82805 Upped to 1.5.107-RC after fix of valgrind detected issues 2015-12-14 15:32:00 +01:00
Jacob Støren
bd1aeaf840 Upped to 1.5.106-RC after fix of final(?) regression-test-detected bug. 2015-12-14 11:28:46 +01:00
Jacob Støren
f436d882b5 Upped to 1.5.105-RC after fix of #707 2015-12-11 17:49:30 +01:00
Magne Sjaastad
7bcf6bfd89 Upped to 1.5.104-RC Release candidate 2015-12-11 10:55:37 +01:00
Jacob Støren
b9318376cc Upped to 1.5.103-dev Release candidate for testing 2015-12-10 12:22:52 +01:00
Jacob Støren
2478898a8b Upped to 1.5.102-dev for Sprint 10 2015-12-07 16:03:12 +01:00
Jacob Støren
419fd28b02 Upped version number to 1.5.101-dev after Sprint 9. 2015-11-24 10:59:49 +01:00
Magne Sjaastad
21ed13d61a Upped version to 1.5.100-dev 2015-11-10 09:02:27 +01:00
Jacob Støren
e8cf23b341 Updated version number to 1.3.106-RC after some minor issues. 2015-11-03 11:32:28 +01:00
Magne Sjaastad
eb72e156a5 Updated version to 1.3.105-RC 2015-11-02 10:06:27 +01:00
Jacob Støren
830874bc20 Upped version to 1.3.104-dev for GM Spring 7 2015-10-23 15:27:56 +02:00