projects / swc-boot-camp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea52b95 e064ce8)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:14:36 +0000 (12:14 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:14:36 +0000 (12:14 -0700)
commit0029b82f0de703149db622c724227e257d3ca0f4
tree80d78e137624061e953a91afe5a9a65354419e7btree | snapshot
parentea52b959e819274f667e936659adce3e5d437493commit | diff
parente064ce8bfb25163eb60eed762d492d5f7eb7ac93commit | 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 setup/
Base material for Software Carpentry, holding subject-level submodules