diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/res | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/res/viewerRes.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index afe6988..65d4cbb 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc | |||
| @@ -156,11 +156,11 @@ BEGIN | |||
| 156 | BEGIN | 156 | BEGIN |
| 157 | VALUE "CompanyName", "meta-impy Viewer Project" | 157 | VALUE "CompanyName", "meta-impy Viewer Project" |
| 158 | VALUE "FileDescription", "meta-impy Experimental" | 158 | VALUE "FileDescription", "meta-impy Experimental" |
| 159 | VALUE "FileVersion", "2010.09.04" | 159 | VALUE "FileVersion", "2011.04.02" |
| 160 | VALUE "InternalName", "meta-impy Experimental" | 160 | VALUE "InternalName", "meta-impy Experimental" |
| 161 | VALUE "OriginalFilename", "meta-impy.exe" | 161 | VALUE "OriginalFilename", "meta-impy.exe" |
| 162 | VALUE "ProductName", "meta-impy Weekly" | 162 | VALUE "ProductName", "meta-impy Weekly" |
| 163 | VALUE "ProductVersion", "2010.09.04" | 163 | VALUE "ProductVersion", "2011.04.02" |
| 164 | END | 164 | END |
| 165 | END | 165 | END |
| 166 | BLOCK "VarFileInfo" | 166 | BLOCK "VarFileInfo" |