diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/viewerinfo.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/viewerinfo.cpp')
| -rw-r--r-- | linden/indra/newview/viewerinfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp index fc463c8..7237c16 100644 --- a/linden/indra/newview/viewerinfo.cpp +++ b/linden/indra/newview/viewerinfo.cpp | |||
| @@ -30,13 +30,14 @@ namespace ViewerInfo | |||
| 30 | 30 | ||
| 31 | // These are intentionally defined here instead of in the header, | 31 | // These are intentionally defined here instead of in the header, |
| 32 | // because they should NOT be read directly. Use the functions. | 32 | // because they should NOT be read directly. Use the functions. |
| 33 | // NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that. | ||
| 33 | const std::string NAME = "Imprudence"; | 34 | const std::string NAME = "Imprudence"; |
| 34 | const std::string VARNT = ""; | 35 | const std::string VARNT = ""; |
| 35 | const S32 MAJOR = 1; | 36 | const S32 MAJOR = 1; |
| 36 | const S32 MINOR = 4; | 37 | const S32 MINOR = 4; |
| 37 | const S32 PATCH = 0; | 38 | const S32 PATCH = 0; |
| 38 | const S32 RLEAS = 3; // increment for each beta/RC/release | 39 | const S32 RLEAS = 3; // increment for each beta/RC/release |
| 39 | const std::string EXTRA = "beta 2"; | 40 | const std::string EXTRA = "exp 1"; |
| 40 | 41 | ||
| 41 | // Mac OS X bundle identifier. Should match the one in Info.plist. | 42 | // Mac OS X bundle identifier. Should match the one in Info.plist. |
| 42 | const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; | 43 | const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; |