Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Liru/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2013-08-10 20:11:47 -03:00
parent 412459ec3d 650f9857bf
commit 62e0db83bd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -10551,7 +10551,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>PerAccountSettingsFile</key> <key>PerAccountSettingsFile</key>
<map> <map>

2
indra/newview/app_settings/settings_ascent.xml
View File

@@ -266,7 +266,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>AscentShowOthersTag</key> <key>AscentShowOthersTag</key>
<map> <map>

2
indra/newview/rlvdefines.h
View File

@@ -75,7 +75,7 @@ const S32 RLV_VERSION_BUILD = 0;
// Implementation version // Implementation version
const S32 RLVa_VERSION_MAJOR = 1; const S32 RLVa_VERSION_MAJOR = 1;
const S32 RLVa_VERSION_MINOR = 4; const S32 RLVa_VERSION_MINOR = 4;
const S32 RLVa_VERSION_PATCH = 5; const S32 RLVa_VERSION_PATCH = 8;
const S32 RLVa_VERSION_BUILD = 0; const S32 RLVa_VERSION_BUILD = 0;
// Uncomment before a final release // Uncomment before a final release