Merge branch 'master' into tabular

This commit is contained in:
Ian Bell
2015-02-27 22:54:28 -07:00
5 changed files with 119 additions and 19 deletions

View File

@@ -25,6 +25,7 @@
X(ALTERNATIVE_REFPROP_PATH, "ALTERNATIVE_REFPROP_PATH", "") \
X(ALTERNATIVE_REFPROP_HMX_BNC_PATH, "ALTERNATIVE_REFPROP_HMX_BNC_PATH", "") \
X(REMOVE_RAW_TABLES, "REMOVE_RAW_TABLES", true) \
X(MAXIMUM_TABLE_DIRECTORY_SIZE_IN_GB, "MAXIMUM_TABLE_DIRECTORY_SIZE_IN_GB", 1.0) \
// Use preprocessor to create the Enum
enum configuration_keys{