diff options
| author | simon <none@none> | 2013-10-04 09:00:21 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-04 09:00:21 -0700 |
| commit | e8d9b05a29fc2721d52b297745cf1a0cce3351a1 (patch) | |
| tree | f8aaaa84bcdca3c0a755b92165aa90bdd519e520 | |
| parent | f8e5ae8006b144b111f474640beb96ae135ae8ed (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge downstream code
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -465,3 +465,4 @@ fe4f7c5e9fd27e09d03deb1cc9ab3e5093f6309e 3.6.3-release 83357f31d8dbf048a8bfdc323f363bf4d588aca1 CHOP-951-a 91ed595b716f14f07409595b734fda891a59379e 3.6.4-release bf6d453046011a11de2643fac610cc5258650f82 3.6.5-release +ae457ece77001767ae9613148c495e7b98cc0f4a 3.6.7-release diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 5b3413147c..424e1794de 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.7 +3.6.8 |