Commit Graph

265 Commits (1facc53a26294df7fb2a42f8f3d025176b8c384a)

Author SHA1 Message Date
Alex Johnstone 1facc53a26 Merge pull request #5 from jackhumbert/master
Sync with upstream
2016-04-05 07:44:37 -07:00
Erez Zukerman 0cdf5d292c Merge pull request #235 from mbarkhau/master
add indent to generated keymap
2016-04-04 08:04:31 +03:00
Manuel Barkhau 22691de580 add indent to generated keymap 2016-04-03 21:46:32 +02:00
Erez Zukerman 8d39263d24 Merge pull request #213 from mbarkhau/master
Add manuneo layout
2016-04-03 08:56:08 +03:00
Manuel Barkhau 381a9fd553 use action function for unicode 2016-04-02 23:12:38 +02:00
Stephan Bösebeck f0424a0c0f Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-04-02 15:15:21 +02:00
Stephan Bösebeck 71cdfe1168 new keymap 2016-04-02 15:14:14 +02:00
Stephan Bösebeck aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-01 23:54:16 +02:00
Stephan Bösebeck c274699085 minor tweaks at the keymap, new png for documentation 2016-04-01 23:53:09 +02:00
Stephan Bösebeck dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 2016-03-31 23:15:59 +02:00
David Mohr 5fae86849a Also add compiled hex file 2016-03-30 09:47:34 -06:00
David Mohr fe6c3e4f0f Squisher's international dvorak variant for ergodox ez
See README.md
2016-03-30 09:47:34 -06:00
mbarkhau 77fa2b0056 Update compile_keymap.py 2016-03-29 18:35:47 +02:00
Stephan Bösebeck ac22d1c185 added CTL_Shift / Hash macro 2016-03-29 13:02:14 +02:00
Manuel Barkhau a2d3c0bd93 add hex file 2016-03-28 23:42:55 +02:00
Manuel Barkhau 295036d4e3 Merge remote-tracking branch 'origin/master' 2016-03-28 21:36:02 +00:00
Manuel Barkhau 32c7832609 Refactor compiler code 2016-03-28 23:35:12 +02:00
Stephan Bösebeck 37e68596dd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 22:29:18 +02:00
Alex Johnstone 48899673af Updated hex 2016-03-28 16:14:25 +01:00
Alex Johnstone 474eaead3c ££££ 2016-03-28 08:09:27 -07:00
Alex Johnstone ad2d3144ed Forgot to change ent/spc 2016-03-28 15:50:09 +01:00
Alex Johnstone 482dbe4c45 Didn't 2016-03-28 07:24:51 -07:00
Matthew Carroll a1ce133203 Corrected duplicate image issue 2016-03-28 06:00:05 -04:00
Matthew Carroll beda4e6fd3 Added msc keymap for ergodox_ez 2016-03-27 23:51:11 -04:00
Alex Johnstone 1415e3108f Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:50:49 -07:00
Alex Johnstone 97b431162c Merge pull request #4 from jackhumbert/master
upstream
2016-03-27 20:15:02 -07:00
Alex Johnstone d3e89b8cbd Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:14:03 -07:00
Erez Zukerman 16da54cfa0 Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27 09:10:05 +03:00
Erez Zukerman 6a31d92276 Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
2016-03-27 09:08:23 +03:00
Manuel Barkhau 20a3229faf Add manuneo layout 2016-03-27 02:24:35 +00:00
Nicholas Keene e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 2016-03-26 00:44:20 -05:00
Nicholas Keene 97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-26 00:40:54 -05:00
Alex Johnstone 2d90374912 Merge pull request #3 from jackhumbert/master
Pull upstream
2016-03-25 11:16:33 -07:00
Erez Zukerman c9aec8bc24 Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
2016-03-25 19:37:42 +03:00
Nicholas Keene d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 2016-03-24 23:10:21 -05:00
Stephan Bösebeck 94e96456b8 minor changes 2016-03-24 10:30:27 +01:00
Stephan Bösebeck 8b883c797f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-24 08:22:21 +01:00
Alex Johnstone fb6dc7499f New 💷 method 2016-03-23 21:13:05 -07:00
Alex Johnstone 02e259dc82 New 💷 method 2016-03-23 21:12:23 -07:00
Alex Johnstone 98593e8c0d New 💷 method 2016-03-23 21:11:05 -07:00
Alex Johnstone 2530f45e2b New 💷 method 2016-03-23 21:06:20 -07:00
Alex Johnstone add089ab1a New 💷 method 2016-03-23 21:04:45 -07:00
Alex Johnstone da63179962 Wrong date 2016-03-23 14:10:55 -07:00
Alex Johnstone 15106471b1 Removed whitespace 2016-03-22 21:52:40 -07:00
Alex Johnstone c7a9a1ebd0 Revised to version 0.1.0 2016-03-22 21:50:53 -07:00
Alex Johnstone 5872f80c96 Merge pull request #2 from jackhumbert/master
Update my repo to upstream
2016-03-22 10:38:03 -07:00
Alex Johnstone 4a7e131604 Meh -> Hyper 2016-03-22 07:43:28 -07:00
Alex Johnstone 84647efebb Update readme.md 2016-03-22 07:42:47 -07:00
Alex Johnstone c1a520fb81 Added photo 2016-03-22 07:36:40 -07:00
Alex Johnstone d1f446962a Added real life layout 2016-03-22 07:34:07 -07:00