diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
| commit | 344c46a20c8055daada15d70bf2dbd2cd5555be8 (patch) | |
| tree | d7ff514786aa3b1347ad768a64b68bfd08e99f90 /indra/llcommon/llversionviewer.h | |
| parent | 127f6d14050bd1d10b3a4b4b8a4c315da43e9f92 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
merge, conflicts in llvertexbuffer.{h,cpp}
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 99ab053b25..a869c74189 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 3; -const S32 LL_VERSION_MINOR = 2; -const S32 LL_VERSION_PATCH = 8; +const S32 LL_VERSION_MINOR = 3; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |