From: W. Trevor King <wking@tremily.us>
Date: Mon, 16 Jun 2014 04:52:23 +0000 (-0700)
Subject: Merge branch 'inno' into namespaced-inno
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e84c644fb64c51a6541a42dc9306d0a0ad5ad44f;p=swc-setup-windows-installer.git

Merge branch 'inno' into namespaced-inno

* inno:
  Add a Software Carpentry icon file for Windows installer
  Add script for building Windows installer
  Add setup.py file for building Windows installer
---

e84c644fb64c51a6541a42dc9306d0a0ad5ad44f
diff --cc setup/windows-installer/setup.py
index 0000000,74f40e8..74f40e8
mode 000000,100644..100644
--- a/setup/windows-installer/setup.py
+++ b/setup/windows-installer/setup.py
diff --cc setup/windows-installer/software-carpentry-logo.ico
index 0000000,1dcaf21..1dcaf21
mode 000000,100644..100644
Binary files differ
diff --cc setup/windows-installer/swc-installer.iss
index 0000000,eacc71f..eacc71f
mode 000000,100644..100644
--- a/setup/windows-installer/swc-installer.iss
+++ b/setup/windows-installer/swc-installer.iss