Merge remote-tracking branch 'singu/master'

This commit is contained in:
Aleric Inglewood
2013-11-15 18:00:49 +01:00
106 changed files with 4827 additions and 1728 deletions

View File

@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 8;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = ${vBUILD};
const char * const LL_CHANNEL = "${VIEWER_CHANNEL}";