Merge lp:~mandel/ubuntuone-windows-installer/fix_655847 into lp:ubuntuone-windows-installer/beta
Proposed by
Manuel de la Peña
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Manuel de la Peña | ||||
Approved revision: | 115 | ||||
Merged at revision: | 105 | ||||
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/fix_655847 | ||||
Merge into: | lp:ubuntuone-windows-installer/beta | ||||
Prerequisite: | lp:~mandel/ubuntuone-windows-installer/fix_655853 | ||||
Diff against target: |
64 lines (+8/-8) 2 files modified
src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx (+4/-4) src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs (+4/-4) |
||||
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/fix_655847 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rick McBride (community) | Needs Information | ||
Review via email:
|
Description of the change
Fix lp:655847 by updating the resource file.
To post a comment you must log in.
I'm getting the following at the end of running tests with this branch:
BUILD FAILED - 0 non-fatal error(s), 4 warning(s)
C:\canonical\ ubuntuone- windows- installer\ review\ main.build( 182,4) ubuntuone- windows- installer\ review\ tools\NUnit\ nunit-console. exe (return code was 2)
External Program Failed! C:\canonical\
This has not happened with the past few branch reviews. I have repeated the problem twice (clean, tests, clean, tests)