projects / swc-workshop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26f69b4 b4d7ea1)
Merge branch 'namespaced' of git://tremily.us/swc-setup-installation-test into assembled assembled
authorW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 04:04:33 +0000 (21:04 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 04:04:33 +0000 (21:04 -0700)
* 'namespaced' of git://tremily.us/swc-setup-installation-test:
  swc-installation-test-2.py: Bump minimum IPython version to 1.0
  README.md: Convert 'boot camp' -> 'workshop'


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