diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-04-03 21:06:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 21:06:40 -0400 |
| commit | 27aa185222b709dc53a1478e46d6e04271dc199c (patch) | |
| tree | fd6311aa6fb2b10fc01d2562e819817d798668b2 /quantum/keymap.h | |
| parent | 4e51c1e3ca75c9abe45673866d026cc0f810a410 (diff) | |
| parent | 3ac9259742bfd428f71c31dbf2bfedace2a7f91b (diff) | |
| download | qmk_firmware-27aa185222b709dc53a1478e46d6e04271dc199c.tar.gz qmk_firmware-27aa185222b709dc53a1478e46d6e04271dc199c.zip | |
Merge branch 'master' into master
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index c000d2da8..5d64be19c 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2012,2013 Jun Wako <wakojun@gmail.com> | 2 | Copyright 2012-2016 Jun Wako <wakojun@gmail.com> |
| 3 | 3 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 4 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |