Skip to content

Commit

Permalink
Merge pull request #3771 from OPM/dev
Browse files Browse the repository at this point in the history
Merge dev into master for Release 2018.11
  • Loading branch information
magnesj authored Nov 28, 2018
2 parents 55341cd + 5f9a80b commit bd44ec8
Show file tree
Hide file tree
Showing 2,093 changed files with 108,308 additions and 38,418 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Checks: '-*,modernize-use-nullptr'
Checks: '-*,modernize-use-nullptr,modernize-use-override'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
...
7 changes: 7 additions & 0 deletions ApplicationCode/Adm/LicenseInformation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -464,3 +464,10 @@ CRAVA is a software package for seismic inversion and conditioning of
This Source Code Form is subject to the terms of the Mozilla
Public License v. 2.0. If a copy of the MPL was not distributed
with this file, You can obtain one at http://mozilla.org/MPL/2.0/.

===============================================================================
Notice for the Contour Line "conrec" code
===============================================================================

Adapted from work by Paul D. Bourke named "conrec"
http://paulbourke.net/papers/conrec/.
Loading

0 comments on commit bd44ec8

Please sign in to comment.