diff options
| author | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
| commit | d3b9f715f0ad9516fa350a5c0b83330b733ee0f9 (patch) | |
| tree | e1481a7b83ae6f4fa0a88c4eebb6dbecd83e86fd /linden/indra/newview/viewerinfo.cpp | |
| parent | Another possible fix for misplaced HUDs? (diff) | |
| parent | Made the voice license window resizable (diff) | |
| download | meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.zip meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.gz meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.bz2 meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious.
Conflicts:
.gitignore
linden/indra/cmake/00-Common.cmake
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerinfo.cpp
The usual branding conflicts.
Diffstat (limited to 'linden/indra/newview/viewerinfo.cpp')
| -rw-r--r-- | linden/indra/newview/viewerinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp index 176a8cd..1762096 100644 --- a/linden/indra/newview/viewerinfo.cpp +++ b/linden/indra/newview/viewerinfo.cpp | |||
| @@ -35,8 +35,8 @@ namespace ViewerInfo | |||
| 35 | const S32 MAJOR = 1; | 35 | const S32 MAJOR = 1; |
| 36 | const S32 MINOR = 4; | 36 | const S32 MINOR = 4; |
| 37 | const S32 PATCH = 0; | 37 | const S32 PATCH = 0; |
| 38 | const S32 RLEAS = 2; // increment for each beta/RC/release | 38 | const S32 RLEAS = 3; // increment for each beta/RC/release |
| 39 | const std::string EXTRA = "beta 1.5"; | 39 | const std::string EXTRA = "beta 2"; |
| 40 | 40 | ||
| 41 | // Mac OS X bundle identifier. Should match the one in Info.plist. | 41 | // Mac OS X bundle identifier. Should match the one in Info.plist. |
| 42 | const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; | 42 | const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; |