summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix ergodox link (again?) Nigel Lundsten2016-08-171-1/+1
* Merge pull request #635 from algernon/f/ucisJack Humbert2016-08-154-30/+221
|\
| * process_unicode: Introduce a slight delayGergely Nagy2016-08-152-0/+8
| * process_unicode: Replace register_hex32Gergely Nagy2016-08-152-13/+32
| * process_unicode: Use uint32_t for UCIS purposesGergely Nagy2016-08-152-6/+13
| * process_unicode: Make the startup overridableGergely Nagy2016-08-152-0/+6
| * process_unicode: Call process_ucis() automaticallyGergely Nagy2016-08-153-2/+5
| * process_unicode: Handle too long UCIS symbol namesGergely Nagy2016-08-151-1/+9
| * process_unicode: Add a way to enter unicode symbols by nameGergely Nagy2016-08-153-3/+126
| * process_unicode: Small refactor & linux fixGergely Nagy2016-08-152-31/+48
|/
* Merge pull request #634 from di0ib/masterJack Humbert2016-08-1417-0/+440
|\
| * moved to handwired folderdi0ib2016-08-1417-3/+3
| * Merge branch 'master' of https://github.com/di0ib/qmk_firmwaredi0ib2016-08-141-0/+2
| |\
| | * Updated readmedi0ib2016-08-141-0/+2
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib2016-08-1422-9/+1234
| |\ \ | |/ / |/| / | |/
* | Merge pull request #631 from jacwib/masterJack Humbert2016-08-144-0/+246
|\ \
| * | Fix bugjacwib2016-08-141-1/+1
| * | Remove pointless commentsjacwib2016-08-141-21/+21
| * | Update readme.mdjacwib2016-08-141-1/+2
| * | Update Makefilejacwib2016-08-141-5/+0
| * | Update config.hjacwib2016-08-141-1/+0
| * | Update keymap.cjacwib2016-08-141-1/+1
| * | Update readme.mdjacwib2016-08-141-2/+2
| * | Jack's keymap.jacwib2016-08-144-0/+251
* | | Merge pull request #627 from algernon/h/set-unicode-input-modeJack Humbert2016-08-141-1/+1
|\ \ \
| * | | process_unicode: Fix set_unicode_input_mode()Gergely Nagy2016-08-131-1/+1
* | | | Merge pull request #624 from Xyverz/masterJack Humbert2016-08-1417-8/+987
|\ \ \ \ | |_|/ / |/| | |
| * | | Added my own layout to the Phantom.Xyverz2016-08-141-0/+104
| * | | Fixing a mixup. Tidying up the keymap.Xyverz2016-08-131-10/+0
| * | | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1350-1420/+2937
| |\ \ \ | |/ / / |/| | |
| * | | Removal of old minivan44 folder.Ian Sterling2016-08-1313-564/+0
| * | | Renamed minivan44 to tv44 in all occurrences per wishes ofIan Sterling2016-08-1313-0/+564
| * | | Adding the MiniVan44 aka TheVan 44 by u/evangs to the repo.Ian Sterling2016-08-1213-0/+564
| * | | Update keymap.cXyverz2016-08-121-4/+0
| * | | Corrections to the Atreus Makefile and updates to my keymapIan Sterling2016-08-121-1/+5
| * | | Delete keymap.cXyverz2016-08-111-67/+0
| * | | Update keymap.cXyverz2016-08-111-2/+2
| * | | Update MakefileXyverz2016-08-111-4/+4
| * | | Added braces using LSFT(KC_LBRC) and LSFT(KC_RBRC) since the normal RBCR and ...Ian Sterling2016-08-091-1/+1
| * | | Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds per...Ian Sterling2016-08-092-0/+378
| * | | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareIan Sterling2016-08-085-554/+0
| |\ \ \
| | * | | Delete keymap.cXyverz2016-08-081-184/+0
| | * | | Delete README.mdXyverz2016-08-081-2/+0
| | * | | Delete README.mdXyverz2016-08-081-49/+0
| | * | | Delete old_keymap.cXyverz2016-08-081-311/+0
| | * | | Delete readme.mdXyverz2016-08-081-10/+0
| | * | | Delete dvorak.pngXyverz2016-08-081-0/+0
| * | | | Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility...Ian Sterling2016-08-083-204/+160
| |/ / /
| * | | Adding my own keymaps to the following keyboards:Ian Sterling2016-08-0811-0/+1369
| | | * cleanup readmedi0ib2016-08-141-3/+3