projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9bf13b8 946680f)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:04:40 +0000 (12:04 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:04:40 +0000 (12:04 -0700)
commitb41fdd64312d987de5ce4cce71d6be7d3a13cd09
tree6c35f122f65f3170c590e5f8e65c4d9cef099a01tree | snapshot
parent9bf13b83c681ccaf65f304a367e2d321277765bacommit | diff
parent946680ff7d97e09ad54abbc9191e0701ca6dd20ccommit | diff
Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  swc-windows-installer.py: Remove nesting setup/
Base material for Software Carpentry, holding subject-level submodules