projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3827bd 99591c7)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:29:56 +0000 (12:29 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:29:56 +0000 (12:29 -0700)
commit7e11c3be615ee9aa41f3b501bcfd1998f864340d
treee720d10f857d9b9be90df79d7081770071c19790tree | snapshot
parentd3827bdf82657d367549fde3caf78c55ca36134bcommit | diff
parent99591c7fa6f4b466c2175ec0dcf46d9b2ef78a20commit | 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.

* 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
Base material for Software Carpentry, holding subject-level submodules