projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af50b95 9494c87)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 02:36:19 +0000 (19:36 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 02:36:19 +0000 (19:36 -0700)
commit0ae5ce268212115529d15d2a048fe3a1e0938a64
treefd800f5656ec9f6cf9b41aa215bb64963c3b07fdtree | snapshot
parentaf50b9563710e7f8037e1aa453515e92e6dc49f1commit | diff
parent9494c87aa58ef2fc9d3e69051ce2682102c13004commit | 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:
  README.md: Remove nesting modular/shell/
Base material for Software Carpentry, holding subject-level submodules