From: W. Trevor King <wking@tremily.us>
Date: Sat, 18 Oct 2014 03:35:15 +0000 (-0700)
Subject: Merge branch 'master' into namespaced-python
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac688c39ab847e26b091a342ed9c82095e21cfdb;p=swc-workshop.git

Merge branch 'master' into namespaced-python

10682b9 (swc-windows-installer.py: Add --version and start with 0.1)
is the last commit in the python branch that landed in v0.1.
Significant changes:

* Add a README and COPYING metadata
* Add a --version option

* master:
  swc-windows-installer.py: Add --version and start with 0.1
  swc-windows-installer.py: Search ProgramW6432 and ProgramFiles(x86)
  swc-windows-installer.py: Add missing space to 'c:\ProgramFiles'
  swc-windows-installer.py: Set default logging level to INFO
  Fix 'Add' -> 'Adds' to match 'The script' lead-in
  README.md: Copy the docstring into a README
  swc-windows-installer.py: Fix 'swc_windows_installer.py' -> hyphens
  swc-windows-installer.py: Change '~/nano.rc' to 'a ~/nano.rc'
  swc-windows-installer.py: Canonical SQLite capitalization
  COPYING: Add the full text of the MIT license
---

ac688c39ab847e26b091a342ed9c82095e21cfdb
diff --cc setup/windows-installer/COPYING
index 0000000,ea39dcb..ea39dcb
mode 000000,100644..100644
--- a/setup/windows-installer/COPYING
+++ b/setup/windows-installer/COPYING
diff --cc setup/windows-installer/README.md
index 0000000,b308778..b308778
mode 000000,100644..100644
--- a/setup/windows-installer/README.md
+++ b/setup/windows-installer/README.md