projects / swc-modular.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f1f4dfa e09f431)
Merge branch 'master' into namespaced namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 15:53:42 +0000 (08:53 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 15:53:42 +0000 (08:53 -0700)
commit966000cbc50cf96f53364a48c095199473f9b57f
tree02b07fb755741c262fc297799c5dd2842942d691tree | snapshot
parentf1f4dfae43f26b3106195b2337006e3c721c730acommit | diff
parente09f431be6ea2defb8c6e5a7980848fa600287b0commit | diff
Merge branch 'master' into namespaced

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.

  $ git merge --log --no-ff --strategy ours master

* master:
  shell/exercises/hearing: Replace 2012-04-uchichicago commit with 2012-02-trieste
  shell: Add a submodule with POSIX shell examples
Unnamed repository; edit this file 'description' to name the repository.