diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
| commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
| tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /indra/llcommon/llversionviewer.h | |
| parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
| parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) | |
fixed merge conflict in .hgtags
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 117d96ffa6..d22c879243 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |