projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6af7758 d8c9a25)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Tue, 29 Oct 2013 22:58:56 +0000 (15:58 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 29 Oct 2013 22:59:50 +0000 (15:59 -0700)
commitdd37d4aa3fb69cf32fcab21eff18c053f3aff7c3
tree0a1a43b06d2ea2581cdc3685798e5d76fa09f68etree | snapshot
parent6af775830bd0993ecf5d4ca557bcadff6bb91cd4commit | diff
parentd8c9a25a5c3f1ba2d7a202a938a1482c72d6ed64commit | 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:
  dictionary.txt: Remove nesting 1-Shell/
Base material for Software Carpentry, holding subject-level submodules