summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-02-15 16:10:21 -0500
committerJonathan Yap <none@none>2011-02-15 16:10:21 -0500
commiteff712570d389d1b7b36153c48b17d906d5eada3 (patch)
treea3eb4a444fcc23a8d79510c4bdd3de04afe6cc9a /indra/llcommon
parent457683bf51039a1bf9114efe47b9f00e4df842a8 (diff)
parent3555849644ff228a189dd2a21e57def22f142e5d (diff)
STORM-990 Merged from current v-d trying to resolve merge issue Oz was having
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 7d5afe92dc..7703132d90 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,7 +28,7 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 2;
-const S32 LL_VERSION_MINOR = 6;
+const S32 LL_VERSION_MINOR = 7;
const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;