From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Wed, 19 Mar 2008 00:38:44 +0000 (-0700)
Subject: resolve conflict in windows installer conf
X-Git-Tag: allmydata-tahoe-1.0.0~22
X-Git-Url: https://git.rkrishnan.org/module-simplejson-index.html?a=commitdiff_plain;h=d0526ef2f96721d15a951e4c304e06a75f98bdf0;p=tahoe-lafs%2Ftahoe-lafs.git

resolve conflict in windows installer conf
---

diff --git a/windows/installer.tmpl b/windows/installer.tmpl
index ecb01acb..96b1d59c 100644
--- a/windows/installer.tmpl
+++ b/windows/installer.tmpl
@@ -6,7 +6,8 @@ VersionInfoVersion=%(major)d.%(minor)d.%(point)d.%(revision)d
 AppPublisher=Allmydata Inc.
 AppCopyright=Copyright (c) 2004-2008 Allmydata, Inc.
 AppPublisherURL=http://www.allmydata.com/
-AppSupportURL=http://www.allmydata.com/support/
+AppSupportURL=http://support.allmydata.com/
+WizardSmallImageFile=../installer.bmp
 DefaultDirName={pf}\Allmydata 3.0
 DefaultGroupName=Allmydata 3.0
 ; minumum version NT 4, no classic windows