summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* the spacessssJack Humbert2016-04-155-47/+60
* bootmagic somehow not getting enabled, so adding eeconfig to backlight src in...Jack Humbert2016-04-143-10/+5
* might have broken somethingJack Humbert2016-04-142-3/+4
* changing up the makefile a bitJack Humbert2016-04-146-60/+84
* new defaultsJack Humbert2016-04-142-15/+133
* Merge pull request #254 from IBNobody/masterJack Humbert2016-04-1314-113/+585
|\
| * Merge pull request #1 from IBNobody/pc_planckIBNobody2016-04-134-27/+29
| |\
| | * Added parenthesis to midi macro.IBNobody2016-04-131-1/+1
| | * Disabled print.IBNobody2016-04-131-2/+2
| | * Corrected spacing.IBNobody2016-04-131-11/+11
| | * Corrected spacing.IBNobody2016-04-131-13/+15
| | * Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planckIBNobody2016-04-131-4/+4
| | |\ | | |/ | |/|
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-131-4/+4
| |\ \ | |/ / |/| / | |/
* | Merge pull request #252 from Vifon/modifier-release-fixJack Humbert2016-04-131-4/+4
|\ \
| * | Optimize source_layers_cache for the cache memoryWojciech Siewierski2016-04-131-4/+4
|/ /
| * Merge https://github.com/IBNobody/qmk_firmware into pc_planckIBNobody2016-04-130-0/+0
| |\
| | * Merge remote-tracking branch 'refs/remotes/origin/pc_planck'IBNobody2016-04-138-87/+479
| | |\
| * | | Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planckIBNobody2016-04-130-0/+0
| |\| |
| | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-1347-2736/+11041
| | |\ \ | |_|/ / |/| | |
| * | | Compiler Warnings / Atomic TLCIBNobody2016-04-1311-35/+113
| | |/ | |/|
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1347-2736/+11041
| |\ \ | |/ / |/| |
* | | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
|\ \ \
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
* | | | Merge pull request #248 from J3RN/masterErez Zukerman2016-04-122-18/+20
|\ \ \ \
| * | | | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
|/| | | |
| * | | | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| * | | | Stylistic changesJonathan Arnett2016-04-111-1/+1
| * | | | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| * | | | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| * | | | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
* | | | | Merge pull request #246 from romanzolotarev/masterErez Zukerman2016-04-115-5/+1331
|\ \ \ \ \
| * | | | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
* | | | | | Merge pull request #244 from nicosuave/add_nico_planck_keymapJack Humbert2016-04-111-0/+69
|\ \ \ \ \ \
| * | | | | | Add my keymapNico Ritschel2016-04-091-0/+69
* | | | | | | Merge pull request #236 from tak3over/masterJack Humbert2016-04-112-49/+43
|\ \ \ \ \ \ \
| * | | | | | | another modification of layers, restored arrow keys and added cut/pastetak3over2016-04-071-13/+31
| * | | | | | | switched raise and lower layerstak3over2016-04-061-16/+13
| * | | | | | | updated my keymaptak3over2016-04-051-3/+1
| * | | | | | | Modified keymaptak3over2016-04-051-29/+10
| * | | | | | | Update tak3over.ctak3over2016-04-041-27/+27
| * | | | | | | Merge pull request #2 from jackhumbert/mastertak3over2016-04-0415-1346/+6131
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1 from tak3over/tak3over-patch-1tak3over2016-04-041-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Minor documentation error. Raise and Lower.tak3over2016-04-041-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge pull request #247 from NoahAndrews/fix-path-scriptJack Humbert2016-04-111-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added admin privilege checkNoahAndrews2016-04-111-0/+7
| * | | | | | | | | Updated commentNoahAndrews2016-04-111-1/+1
| * | | | | | | | | Remove failing checkNoahAndrews2016-04-111-1/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #232 from IBNobody/masterJack Humbert2016-04-111-29/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |