summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Thu, 31 Oct 2013 15:38:47 +0000 (08:38 -0700)]
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/
W. Trevor King [Thu, 31 Oct 2013 15:37:25 +0000 (08:37 -0700)]
generate_data.py: Add nesting modular/shell/exercises/hearing/
This gives the submodule-averse the nesting they'd usually get by
merging the master branch in a submodule at
modular/shell/exercises/hello.
W. Trevor King [Thu, 31 Oct 2013 15:19:21 +0000 (08:19 -0700)]
generate_data.py: Remove nesting shellExample/
There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
Richard T. Guy [Mon, 30 Jan 2012 18:23:00 +0000 (13:23 -0500)]
Added Da for Shell example