projects / swc-modular-shell.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0a417c 2baba0e)
Merge branch 'master' into HEAD
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 17:02:51 +0000 (10:02 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 17:02:51 +0000 (10:02 -0700)
commita0c8e8cd93a47386a09c69a0243bae0a2cbd635c
tree6ad28726a29b177d8a834b889d57e60ee9d45706tree | snapshot
parentf0a417c6daab17835bee1dd32e617054800947a9commit | diff
parent2baba0e3c40d69b5d62a30538d7ee566b5ac4714commit | diff
Merge branch 'master' into HEAD

This is a no-op merge, explicitly considering and rejecting the
submodules from the master branch.  After this merge, future merges
from the master branch will pick up any content changes.

* master:
  exercises/hearing: Add the cochlear implant example submodule
POSIX shell tooling for Software Carpentry's modular programming subject