aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon
diff options
context:
space:
mode:
authorAnders Arnholm2008-12-13 10:44:15 +0100
committerAnders Arnholm2008-12-13 10:44:15 +0100
commit5a51c3fbd22d13328a84de0ba315b17e06213bdc (patch)
tree44b08892f173c2497def740ce566c2ceba475a16 /linden/indra/llcommon
parentBumped version to RC3. (diff)
parentImprudence 1.0.0 finalized. (diff)
downloadmeta-impy-5a51c3fbd22d13328a84de0ba315b17e06213bdc.zip
meta-impy-5a51c3fbd22d13328a84de0ba315b17e06213bdc.tar.gz
meta-impy-5a51c3fbd22d13328a84de0ba315b17e06213bdc.tar.bz2
meta-impy-5a51c3fbd22d13328a84de0ba315b17e06213bdc.tar.xz
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts: ChangeLog.txt RELEASE_NOTES.txt linden/indra/llcommon/llversionviewer.h
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ac85f81..ab7e415 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,6 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
45const S32 IMP_VERSION_MAJOR = 1; 45const S32 IMP_VERSION_MAJOR = 1;
46const S32 IMP_VERSION_MINOR = 0; 46const S32 IMP_VERSION_MINOR = 0;
47const S32 IMP_VERSION_PATCH = 0; 47const S32 IMP_VERSION_PATCH = 0;
48const char * const IMP_VERSION_TEST = "RC3"; 48const char * const IMP_VERSION_TEST = "";
49 49
50#endif 50#endif