aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Seikel2011-06-25 20:53:34 +1000
committerDavid Seikel2011-06-25 20:53:34 +1000
commitebd9da45ca6763ada785e258895a4cd795a40d16 (patch)
tree479b40e2964b5ab1320a3c450a23d4211c66591d
parentClean up the tag colour stuff after the merge. (diff)
parentImprudence 1.4.0 beta 1 released. (diff)
downloadmeta-impy-ebd9da45ca6763ada785e258895a4cd795a40d16.zip
meta-impy-ebd9da45ca6763ada785e258895a4cd795a40d16.tar.gz
meta-impy-ebd9da45ca6763ada785e258895a4cd795a40d16.tar.bz2
meta-impy-ebd9da45ca6763ada785e258895a4cd795a40d16.tar.xz
Merge branch 'next' of git://github.com/jacek/imprudence into next
-rw-r--r--linden/indra/newview/viewerinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index 59e35d4..89ce564 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -34,7 +34,7 @@ namespace ViewerInfo
34 const std::string VARNT = ""; 34 const std::string VARNT = "";
35 const S32 MAJOR = 1; 35 const S32 MAJOR = 1;
36 const S32 MINOR = 4; 36 const S32 MINOR = 4;
37 const S32 PATCH = 1; 37 const S32 PATCH = 0;
38 const S32 RLEAS = 1; // increment for each beta/RC/release 38 const S32 RLEAS = 1; // increment for each beta/RC/release
39 const std::string EXTRA = "beta 1"; 39 const std::string EXTRA = "beta 1";
40 40