diff options
| author | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
| commit | 56a1de48ee43bfacbd3ef2859f392082a26bc814 (patch) | |
| tree | 03bd6092dab42985e536b84d2f311a3a12e4edb4 /linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss | |
| parent | Added a licensing note about gpg.vs, as used to build OTR on Windows. (diff) | |
| parent | Merge remote-tracking branch 'origin/next' into WL-refactor (diff) | |
| download | meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.zip meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.gz meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.bz2 meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.xz | |
Merge remote-tracking branch 'imprudence/next' into next
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
Diffstat (limited to 'linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss')
| -rw-r--r-- | linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss index c551919..a396381 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss | |||
| @@ -9,15 +9,15 @@ | |||
| 9 | ; These will change | 9 | ; These will change |
| 10 | AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} | 10 | AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} |
| 11 | AppName=Imprudence Viewer Experimental | 11 | AppName=Imprudence Viewer Experimental |
| 12 | AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release | 12 | AppVerName=Imprudence Viewer 1.4.0.3 exp 1 windows test release |
| 13 | DefaultDirName={pf}\ImprudenceExperimental | 13 | DefaultDirName={pf}\ImprudenceExperimental |
| 14 | DefaultGroupName=Imprudence Viewer Experimental | 14 | DefaultGroupName=Imprudence Viewer Experimental |
| 15 | VersionInfoProductName=Imprudence Viewer Experimental | 15 | VersionInfoProductName=Imprudence Viewer Experimental |
| 16 | OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test | 16 | OutputBaseFilename=Imprudence-1.4.0.3-exp-1-windows-test |
| 17 | VersionInfoVersion=1.4.0 | 17 | VersionInfoVersion=1.4.0.3 |
| 18 | VersionInfoTextVersion=1.4.0 | 18 | VersionInfoTextVersion=1.4.0.3 |
| 19 | VersionInfoProductVersion=1.4.0 | 19 | VersionInfoProductVersion=1.4.0.3 |
| 20 | AppVersion=1.4.0 | 20 | AppVersion=1.4.0.3 |
| 21 | VersionInfoCopyright=2011 | 21 | VersionInfoCopyright=2011 |
| 22 | 22 | ||
| 23 | ; These won't change | 23 | ; These won't change |