swc-modular.git
11 years agoMerge branch 'master' into namespaced namespaced
W. Trevor King [Thu, 31 Oct 2013 15:53:42 +0000 (08:53 -0700)]
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

11 years agoshell/exercises/hearing: Replace 2012-04-uchichicago commit with 2012-02-trieste master
W. Trevor King [Thu, 31 Oct 2013 15:33:53 +0000 (08:33 -0700)]
shell/exercises/hearing: Replace 2012-04-uchichicago commit with 2012-02-trieste

Replace the copy-paste bf93a25 (added data, 2012-03-20) from the
Chicago boot camp with the earlier 3e24204 (Added Da for Shell
example, 2012-01-30) from the Trieste boot camp [2].

[1]: https://github.com/thehackerwithin/UofCSCBC2012
[2]: https://github.com/thehackerwithin/PyTrieste

11 years agoshell: Add a submodule with POSIX shell examples
W. Trevor King [Thu, 24 Oct 2013 02:40:19 +0000 (19:40 -0700)]
shell: Add a submodule with POSIX shell examples

11 years agoREADME.md: Add nesting modular/
W. Trevor King [Thu, 24 Oct 2013 02:41:21 +0000 (19:41 -0700)]
README.md: Add nesting modular/

This gives the submodule-averse the nesting they'd usually get by
merging the master branch in a submodule at modular/.  They'll have to
merge the submodule's 'namespaced' branches by hand to pull in the
equivalent content.

11 years agoREADME.md: Summarize the purpose of this repository
W. Trevor King [Thu, 24 Oct 2013 02:39:40 +0000 (19:39 -0700)]
README.md: Summarize the purpose of this repository