Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/add_ubuntuone_branding into lp:ubuntuone-windows-installer/beta

  1. add_ubuntuone_branding
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 178
Merged at revision: 141
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_ubuntuone_branding
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/start_app_after_install
Diff against target: 22 lines (+3/-3)
1 file modified
install/UbuntuOne7.wxs (+3/-3)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_ubuntuone_branding
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+40825@code.launchpad.net

Description of the change

Added the required branding for the msi installer.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs 2010-11-15 01:16:29 +0000
+++ install/UbuntuOne7.wxs 2010-11-15 01:16:29 +0000
@@ -1626,9 +1626,9 @@
1626 1626
1627 <!-- UI settings, to be defined by the design team -->1627 <!-- UI settings, to be defined by the design team -->
1628 1628
1629 <!-- <WixVariable Id="WixUIBannerBmp" Value="path\banner.bmp" />1629 <WixVariable Id="WixUIBannerBmp" Value="img\banner.bmp" />
1630 <WixVariable Id="WixUIDialogBmp" Value="path\dialog.bmp" />1630 <WixVariable Id="WixUIDialogBmp" Value="img\dialog.bmp" />
1631 <WixVariable Id="WixUIExclamationIco" Value="path\exclamation.ico" />1631 <!-- <WixVariable Id="WixUIExclamationIco" Value="path\exclamation.ico" />
1632 <WixVariable Id="WixUIInfoIco" Value="path\information.ico" />1632 <WixVariable Id="WixUIInfoIco" Value="path\information.ico" />
1633 <WixVariable Id="WixUINewIco" Value="path\new.ico" />1633 <WixVariable Id="WixUINewIco" Value="path\new.ico" />
1634 <WixVariable Id="WixUIUpIco" Value="path\up.ico" /> -->1634 <WixVariable Id="WixUIUpIco" Value="path\up.ico" /> -->
16351635
=== added directory 'install/img'
=== added file 'install/img/banner.bmp'
1636Binary files install/img/banner.bmp 1970-01-01 00:00:00 +0000 and install/img/banner.bmp 2010-11-15 01:16:29 +0000 differ1636Binary files install/img/banner.bmp 1970-01-01 00:00:00 +0000 and install/img/banner.bmp 2010-11-15 01:16:29 +0000 differ
=== added file 'install/img/dialog.bmp'
1637Binary files install/img/dialog.bmp 1970-01-01 00:00:00 +0000 and install/img/dialog.bmp 2010-11-15 01:16:29 +0000 differ1637Binary files install/img/dialog.bmp 1970-01-01 00:00:00 +0000 and install/img/dialog.bmp 2010-11-15 01:16:29 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: