summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Wed, 23 Oct 2013 19:29:56 +0000 (12:29 -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.
* master:
installation-test: Add a submodule with my installation test scripts
windows-installer: Add a submodule with Ethan's Windows installer
get-my-ip: Add a submodule with my IP detection script
W. Trevor King [Wed, 23 Oct 2013 19:18:41 +0000 (12:18 -0700)]
README.md: Add nesting setup/
This gives the submodule-averse the nesting they'd usually get by
merging the master branch in a submodule at setup/. They'll have to
merge the submodule's 'namespaced' branches by hand to pull in the
equivalent content.
W. Trevor King [Wed, 23 Oct 2013 19:16:35 +0000 (12:16 -0700)]
installation-test: Add a submodule with my installation test scripts
W. Trevor King [Wed, 23 Oct 2013 19:11:21 +0000 (12:11 -0700)]
windows-installer: Add a submodule with Ethan's Windows installer
W. Trevor King [Wed, 23 Oct 2013 19:07:53 +0000 (12:07 -0700)]
get-my-ip: Add a submodule with my IP detection script
W. Trevor King [Wed, 23 Oct 2013 19:06:42 +0000 (12:06 -0700)]
README: Summarize the purpose of this repository