projects / swc-workshop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bea4eac 8e8ca6e)
Merge branch 'namespaced' of git://tremily.us/swc-setup-windows-installer into assembled
authorW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 16:04:19 +0000 (09:04 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 16:04:19 +0000 (09:04 -0700)
* 'namespaced' of git://tremily.us/swc-setup-windows-installer:
  swc-windows-installer.py: Restore nose entry point


Trivial merge
Base material for Software Carpentry, holding subject-level submodules