Skip to content

Commit 8369bc6

Browse files
Paulo CarvalhoPaulo Carvalho
authored andcommitted
Closing version 6.12.
1 parent a0c898f commit 8369bc6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

GammaRay.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ win32 {
823823
# The application version
824824
# Don't forget to update the Util::importSettingsFromPreviousVersion() method to
825825
# enable the import of registry/user settings of previous versions.
826-
VERSION = 6.9
826+
VERSION = 6.12
827827

828828
# Define a preprocessor macro so we can get the application version in application code.
829829
DEFINES += APP_VERSION=\\\"$$VERSION\\\"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ If you enjoyed this project, you might also enjoy GeostatsPy: https://github.com
1515
Python script to convert Eclipse grids to Paraview-compatible VTU format: https://github.com/BinWang0213/PyGRDECL
1616

1717
VERSION HISTORY:<br>
18+
&nbsp;&nbsp;&nbsp;Version 6.12 - Several new methods to work with grids. Several fixes and enhancements.
1819
&nbsp;&nbsp;&nbsp;Version 6.9 - Export geologic grids as Eclipse grids, multiple other new features, enhancements and fixes.<br>
1920
&nbsp;&nbsp;&nbsp;Version 6.7 - New data type: Geologic section.<br>
2021
&nbsp;&nbsp;&nbsp;Version 6.6 - Mean, median and Gaussian filters, improvements and bug fixes.<br>

docs/GammaRayManual.docx

-1.67 KB
Binary file not shown.

util.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,11 +1068,11 @@ void Util::importSettingsFromPreviousVersion()
10681068
QSettings currentSettings;
10691069
//The list of previous versions (order from latest to oldest version is advised)
10701070
QStringList previousVersions;
1071-
previousVersions << "6.7" << "6.6" << "6.5" << "6.3" << "6.2" << "6.1" << "6.0" << "5.7.1" << "5.7" << "5.5"
1072-
<< "5.3" << "5.1" << "5.0" << "4.9" << "4.7" << "4.5.1" << "4.5" << "4.3.3" << "4.3"
1073-
<< "4.0" << "3.8" << "3.6.1" << "3.6" << "3.5" << "3.2" << "3.0" << "2.7.2" << "2.7.1"
1074-
<< "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2" << "2.1" << "2.0"
1075-
<< "1.7.1" << "1.7" << "1.6" << "1.5" << "1.4" << "1.3.1" << "1.3" << "1.2.1"
1071+
previousVersions << "6.9" << "6.7" << "6.6" << "6.5" << "6.3" << "6.2" << "6.1" << "6.0" << "5.7.1"
1072+
<< "5.7" << "5.5" << "5.3" << "5.1" << "5.0" << "4.9" << "4.7" << "4.5.1" << "4.5"
1073+
<< "4.3.3" << "4.3" << "4.0" << "3.8" << "3.6.1" << "3.6" << "3.5" << "3.2" << "3.0"
1074+
<< "2.7.2" << "2.7.1" << "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2" << "2.1"
1075+
<< "2.0" << "1.7.1" << "1.7" << "1.6" << "1.5" << "1.4" << "1.3.1" << "1.3" << "1.2.1"
10761076
<< "1.2" << "1.1.0" << "1.0.1" << "1.0";
10771077
//Iterate through the list of previous versions
10781078
QList<QString>::iterator itVersion = previousVersions.begin();

0 commit comments

Comments
 (0)