diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-06-19 07:02:17 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-06-19 07:02:17 -0700 |
| commit | edbacfa108ad55da7f852e401271eb5893e1dab9 (patch) | |
| tree | 677a74b2d274ba3fc14dfa30431b6c3e8ab34fbf | |
| parent | 0094cfabf05c483077a2f5497cf988a8d7f15807 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merge vwr-dev-mat release tags and version change
| -rwxr-xr-x | .hgtags | 3 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -458,3 +458,6 @@ a314f1c94374ab1f6633dd2983f7090a68663eb2 3.5.2-beta4 9b1b6f33aa5394b27bb652b31b5cb81ef6060370 3.5.2-release a277b841729f2a62ba1e34acacc964bc13c1ad6f 3.5.3-release fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1 +69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release +69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release +0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 40c341bdcd..9575d51bad 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.0 +3.6.1 |