projects / swc-workshop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2587ec a82ad6c)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 13 Jan 2014 22:09:37 +0000 (14:09 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 13 Jan 2014 22:09:37 +0000 (14:09 -0800)
* master:
  swc-windows-installer.sh: Convert script from Python to POSIX shell

Conflicts:
setup/windows-installer/swc-windows-installer.py

1  2 
setup/windows-installer/swc-windows-installer.sh patch | | diff2 | blob | history

diff --cc setup/windows-installer/swc-windows-installer.sh
index 0000000000000000000000000000000000000000,8fc15f1c5fa2ac892c9e4319faa61f5c31441f04..8fc15f1c5fa2ac892c9e4319faa61f5c31441f04
mode 000000,100755..100755
--- /dev/null
--- 2/swc-windows-installer.sh
+++ b/setup/windows-installer/swc-windows-installer.sh
Base material for Software Carpentry, holding subject-level submodules