Merge branch 'master' of github.com:jackhumbert/qmk_firmware

# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex

3 files changed, 5 insertions, 5 deletions

diff --git a/tmk_core/protocol/vusb/usbdrv/Changelog.txt b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
index 5c6354ab1e..1e74180a9e 100644
--- a/tmk_core/protocol/vusb/usbdrv/Changelog.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
@@ -28,7 +28,7 @@ Scroll down to the bottom to see the most recent changes.
   - Added (free) default Vendor- and Product-IDs bought from voti.nl.
   - Added USBID-License.txt file which defines the rules for using the free
     shared VID/PID pair.
-  - Added Readme.txt to the usbdrv directory which clarifies administrative
+  - Added readme.txt to the usbdrv directory which clarifies administrative
     issues.
 
 2006-01-25:
diff --git a/tmk_core/protocol/vusb/usbdrv/License.txt b/tmk_core/protocol/vusb/usbdrv/License.txt
index 4460cfbae0..ce4c3aed45 100644
--- a/tmk_core/protocol/vusb/usbdrv/License.txt
+++ b/tmk_core/protocol/vusb/usbdrv/License.txt
@@ -10,7 +10,7 @@ Use the form at http://www.obdev.at/vusb/feedback.html for your submission.
 (2) Adhere to minimum publication standards. Please include AT LEAST:
     - a circuit diagram in PDF, PNG or GIF format
     - full source code for the host software
-    - a Readme.txt file in ASCII format which describes the purpose of the
+    - a readme.txt file in ASCII format which describes the purpose of the
       project and what can be found in which directories and which files
     - a reference to http://www.obdev.at/vusb/
 
diff --git a/tmk_core/protocol/vusb/usbdrv/Readme.txt b/tmk_core/protocol/vusb/usbdrv/Readme.txt
index 970dc66b2f..3cff49f6fa 100644
--- a/tmk_core/protocol/vusb/usbdrv/Readme.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Readme.txt
@@ -1,4 +1,4 @@
-This is the Readme file to Objective Development's firmware-only USB driver
+This is the readme file to Objective Development's firmware-only USB driver
 for Atmel AVR microcontrollers. For more information please visit
 http://www.obdev.at/vusb/
 
@@ -15,7 +15,7 @@ file "usbdrv.h". Please read all of it carefully! Configuration options are
 documented in "usbconfig-prototype.h".
 
 The driver consists of the following files:
-  Readme.txt ............. The file you are currently reading.
+  readme.txt ............. The file you are currently reading.
   Changelog.txt .......... Release notes for all versions of the driver.
   usbdrv.h ............... Driver interface definitions and technical docs.
 * usbdrv.c ............... High level language part of the driver. Link this
@@ -155,7 +155,7 @@ http://www.obdev.at/goto.php?t=vusb-wiki&p=hosted-projects.
 (2) Adhere to minimum publication standards. Please include AT LEAST:
     - a circuit diagram in PDF, PNG or GIF format
     - full source code for the host software
-    - a Readme.txt file in ASCII format which describes the purpose of the
+    - a readme.txt file in ASCII format which describes the purpose of the
       project and what can be found in which directories and which files
     - a reference to http://www.obdev.at/vusb/