projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a05233 949f2a8)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 18:58:00 +0000 (11:58 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 18:58:18 +0000 (11:58 -0700)
commitebc33366f1e0bcf1fa32f296eafb995d2aab6d4e
tree1ba3247863205635b3534592f5dd9607e4111069tree | snapshot
parent3a052331669a621a80f30c304766f0bcb44f2f56commit | diff
parent949f2a8cc33af82e28f01111e13aea442b11a75bcommit | 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:
  get-my-ip.py: Remove nesting setup/
Base material for Software Carpentry, holding subject-level submodules