Merge lp:~bialix/bzr-windows-installers/trunk into lp:bzr-windows-installers

Proposed by Alexander Belchenko
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bialix/bzr-windows-installers/trunk
Merge into: lp:bzr-windows-installers
Diff against target: None lines
To merge this branch: bzr merge lp:~bialix/bzr-windows-installers/trunk
Reviewer Review Type Date Requested Status
Bazaar Developers Pending
Review via email: mp+11926@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Belchenko (bialix) wrote :

critical updates.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/win32/buildout.cfg'
--- tools/win32/buildout.cfg 2009-09-15 03:41:54 +0000
+++ tools/win32/buildout.cfg 2009-09-16 19:45:51 +0000
@@ -79,12 +79,12 @@
79bzrtools-release-tag = tag:release-${settings:bzrtools-release}79bzrtools-release-tag = tag:release-${settings:bzrtools-release}
80bzrtools-trunk-url = lp:bzrtools80bzrtools-trunk-url = lp:bzrtools
8181
82qbzr-release = 0.14.182qbzr-release = 0.14.2
83qbzr-release-tag = tag:release-${settings:qbzr-release}83qbzr-release-tag = tag:release-${settings:qbzr-release}
84qbzr-release-url = lp:qbzr/0.1484qbzr-release-url = lp:qbzr/0.14
85qbzr-trunk-url = lp:qbzr85qbzr-trunk-url = lp:qbzr
8686
87bzr-explorer-release = 0.8.087bzr-explorer-release = 0.8.1
88bzr-explorer-release-tag = tag:release-${settings:bzr-explorer-release}88bzr-explorer-release-tag = tag:release-${settings:bzr-explorer-release}
89bzr-explorer-trunk-url = lp:bzr-explorer89bzr-explorer-trunk-url = lp:bzr-explorer
9090
9191
=== modified file 'tools/win32/bzr.iss.cog'
--- tools/win32/bzr.iss.cog 2009-09-15 03:23:59 +0000
+++ tools/win32/bzr.iss.cog 2009-09-16 19:30:54 +0000
@@ -199,7 +199,7 @@
199199
200200
201[Icons]201[Icons]
202Name: "{group}\Bazaar Explorer"; Filename: "bzr"; WorkingDir: {sd}\; Parameters: "explorer"; Components: explorer;202Name: "{group}\Bazaar Explorer"; Filename: "{app}\bzr.exe"; WorkingDir: {sd}\; Parameters: "explorer"; Components: explorer;
203Name: "{group}\User Documentation"; Filename: "{app}\bzr-en.chm"; Components: doc\en;203Name: "{group}\User Documentation"; Filename: "{app}\bzr-en.chm"; Components: doc\en;
204Name: "{group}\User Documentation - Spanish"; Filename: "{app}\bzr-es.chm"; Components: doc\es;204Name: "{group}\User Documentation - Spanish"; Filename: "{app}\bzr-es.chm"; Components: doc\es;
205Name: "{group}\User Documentation - Russian"; Filename: "{app}\bzr-ru.chm"; Components: doc\ru;205Name: "{group}\User Documentation - Russian"; Filename: "{app}\bzr-ru.chm"; Components: doc\ru;
@@ -216,8 +216,8 @@
216; ]]]216; ]]]
217; [[[end]]]217; [[[end]]]
218218
219Name: "{commondesktop}\Bazaar Explorer"; Filename: "bzr"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: desktopicon219Name: "{commondesktop}\Bazaar Explorer"; Filename: "{app}\bzr.exe"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: desktopicon
220Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Bazaar Explorer"; Filename: "bzr"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: quicklaunchicon220Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Bazaar Explorer"; Filename: "{app}\bzr.exe"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: quicklaunchicon
221221
222222
223[Tasks]223[Tasks]
@@ -227,7 +227,7 @@
227227
228; [[[cog228; [[[cog
229; if "TBZR" in os.environ:229; if "TBZR" in os.environ:
230; cog.outl('Name: TBZRReadme; Description: "View the TortoiseBZR Readme"; Components: tortoise')230; cog.outl('Name: TBZRReadme; Description: "View the TortoiseBZR Readme"; Components: tortoise; Flags: unchecked')
231; ]]]231; ]]]
232; [[[end]]]232; [[[end]]]
233233

Subscribers

People subscribed via source and target branches