projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba4720c 72b698a)
Merge remote tracking branch 'version-control-svn/namespaced' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 20:07:33 +0000 (13:07 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 20:07:33 +0000 (13:07 -0700)
commitc244280a09b920ebb879aa2abd4b80b2280a90cd
tree307bace000e5bc5aee7c412dcd8770fd752be0betree | snapshot
parentba4720c063fd1501fb00b5a85c547063b3912418commit | diff
parent72b698acd214fad02deb30eb628f62a9acfb0aebcommit | diff
Merge remote tracking branch 'version-control-svn/namespaced' into namespaced

This is a no-op merge, explicitly considering and rejecting the
removal of subject-level documents from this subject-level branch.
After this merge, folks can merge both version-control/namespaced and
version-control-svn/namespaced branches without conflicts.

* version-control-svn/namespaced:
  version-control: Remove subject-level documents from this SVN branch
Base material for Software Carpentry, holding subject-level submodules