From: W. Trevor King <wking@tremily.us>
Date: Mon, 16 Jun 2014 23:08:13 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb4914265aa3bf0d5e7272cc823f527b4660f810;p=swc-setup-windows-installer.git

Merge branch 'master' into namespaced

Expose a new release, with new docs, licensing information, and some
comment cleanups.

* master:
  Fix 'Add' -> 'Adds' to match 'The script' lead-in
  README.md: Update usage for folks running the compiled installer
  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
---

cb4914265aa3bf0d5e7272cc823f527b4660f810
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,81498d2..81498d2
mode 000000,100644..100644
--- a/setup/windows-installer/README.md
+++ b/setup/windows-installer/README.md