Merge branch 'inno' into namespaced-inno
authorW. Trevor King <wking@tremily.us>
Mon, 16 Jun 2014 04:52:23 +0000 (21:52 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 16 Jun 2014 04:52:51 +0000 (21:52 -0700)
commite84c644fb64c51a6541a42dc9306d0a0ad5ad44f
tree1504cf68447547f292d23f7271ed2596b61d1db8
parent9ea60b6639073ebd240a37cbb9aca0d8435c903b
parentc7592d1424793ce07716b6a16266e836d5cee59b
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
setup/windows-installer/setup.py
setup/windows-installer/software-carpentry-logo.ico
setup/windows-installer/swc-installer.iss