projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72b698a f8eecd4)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:46:00 +0000 (12:46 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:46:00 +0000 (12:46 -0700)
commit48b43a4ed19e3d8a16caa109c3849f5a57ca212a
tree90f42bec3c2e70cffc90eb6e8465d8be189a8e93tree | snapshot
parent72b698acd214fad02deb30eb628f62a9acfb0aebcommit | diff
parentf8eecd41e0546d578c54f274373609795ebd5b05commit | 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 version-control/svn
Base material for Software Carpentry, holding subject-level submodules