projects / swc-modular-shell-hearing.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e56bfc c672da0)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 15:38:47 +0000 (08:38 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 15:38:47 +0000 (08:38 -0700)
commit5eb69373bbedaf6cd19875acd330123c1bae797b
tree0593fa5e5afe869b35f034dca7b416cb28f9e356tree | snapshot
parent2e56bfc4748eeb0d818d3e80cc0ea9ee54942421commit | diff
parentc672da0d0d7f476cf1f865b4c32ed51968e5c013commit | 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:
  generate_data.py: Remove nesting shellExample/
Fake coclear implant data for Software Carpentry's shell lesson