Magne Sjaastad b9989b0ebd Merge release into dev ...

There are quite large diff between release and dev, so do a merge to ease later syncing

2019-12-02 12:47:52 +01:00

..

Adm

#4683 clang-format on all files in ApplicationCode

2019-09-06 10:57:22 +02:00

Application

#5106 Fix crash when importing multiple well paths with the same name

2019-12-02 08:01:38 +01:00

CommandFileInterface

clang-format : Set PenaltyBreakAssignment to 130

2019-11-04 15:08:09 +01:00

Commands

Merge release into dev

2019-12-02 12:47:52 +01:00

FileInterface

#4927 Blind attempt at improving reliability of smspec import

2019-11-28 08:03:59 +01:00

GeoMech

#5112 Add cell highlight on intersections with separate intersection result

2019-11-28 14:09:53 +01:00

GrpcInterface

Fix CMake warning in GRPC code

2019-11-29 15:03:52 +01:00

ModelVisualization

#5119, #5120 Default case for intersection result

2019-11-29 10:27:43 +01:00

ProjectDataModel

#5150 Improve wheel zoom with logarithmic axes

2019-12-02 12:34:58 +01:00

ReservoirDataModel

#5129 Fix depth ranges when curve units don't match display units

2019-11-29 15:03:52 +01:00

Resources

#5011 Add icon to Replace Case commands

2019-12-02 10:26:11 +01:00

ResultStatisticsCache

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

2019-11-04 14:35:41 +01:00

SocketInterface

#5112 Make selected result definition available through 3ditem selection system

2019-11-28 14:09:52 +01:00

UnitTests

Fix compile warning in RifActiveCellsReader-Test.cpp

2019-11-29 15:03:52 +01:00

UserInterface

#5150 Improve wheel zoom with logarithmic axes

2019-12-02 12:34:58 +01:00

.clang-format

clang-format : Set PenaltyBreakAssignment to 130

2019-11-04 15:08:09 +01:00

.clang-tidy

#4387 System : Move clang-tidy and clang-format into ApplicationCode

2019-05-03 09:15:18 +02:00

CMakeLists.txt

Fix CMake warning in GRPC code

2019-11-29 15:03:52 +01:00

CustomPCH.cmake

…

Doxyfile

System : Add doxygen generation of Project Data Model

2019-11-07 09:28:11 +01:00

resinsight

…

resinsight.desktop.in

Fix desktop file

2018-03-23 16:09:20 +05:00