diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-27 18:17:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-27 18:17:16 -0400 |
| commit | 743b6ca6177f46d7d7f964993ee226ef6706d408 (patch) | |
| tree | eb56fb5af91bc4dd8f747be02a36a26ddef20561 | |
| parent | 1c6783fdb564cb10ade2a585a874ce951fff34e6 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
merge changes for 3.6.1-release
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -461,3 +461,4 @@ fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1 69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release 69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release 0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release +75cf8e855ae1af6895a35da475314c2b5acf1850 3.6.1-release diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 9575d51bad..b72762837e 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.1 +3.6.2 |