summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into minidoxThat-Canadian2017-07-1446-266/+2224
|\
| * Merge remote-tracking branch 'upstream/master'That-Canadian2017-07-1446-266/+2224
| |\
| | * Merge pull request #1491 from fredizzimo/msys2Jack Humbert2017-07-1312-85/+247
| | |\
| | | * Fix printf error in make output on msys2Fred Sundvik2017-07-121-2/+2
| | | * Fix bitfield problem when compiling in native mingwFred Sundvik2017-07-111-0/+5
| | | * Fix unreferenced errors with mingw compiler and unit testsFred Sundvik2017-07-115-5/+10
| | | * Add more dependencies, everything can be compiled nowFred Sundvik2017-07-111-1/+1
| | | * Add tools to the pathFred Sundvik2017-07-112-1/+39
| | | * Extract flipFred Sundvik2017-07-113-15/+27
| | | * Install arm toolchainFred Sundvik2017-07-111-3/+32
| | | * Download and extract avr toolsFred Sundvik2017-07-111-2/+40
| | | * Fix overlong lines, and a few spelling errorsFred Sundvik2017-07-112-11/+18
| | | * Use home directory for download on msys2Fred Sundvik2017-07-113-15/+15
| | | * Install unzipFred Sundvik2017-07-101-0/+4
| | | * Add symlinks only on WSLFred Sundvik2017-07-103-45/+52
| | | * Fix launch of qmk_driver_installer on msys2Fred Sundvik2017-07-101-1/+2
| | | * Initial structure for shared msys2 and wsl installationFred Sundvik2017-07-104-128/+144
| | * | fix implementation issues from SSD1306 clean up, added rotation (#1494)ishtob2017-07-128-14/+203
| | * | clean up ssd1306 implementationJack Humbert2017-07-113-160/+169
| | * | update drivers to exclude lets_split includeJack Humbert2017-07-111-1/+0
| | * | Adds Hadron Keyboard (#1492)ishtob2017-07-1128-0/+1543
| | * | Updates maartenwut's keymap (#1489)Maarten Dekkers2017-07-112-14/+70
* | | | Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into ...That-Canadian2017-07-141-0/+4
|\ \ \ \
| * | | | Fixed RGB being enabled by default, now it must be turned on at the keymap levelThat-Canadian2017-07-102-2/+3
| * | | | cleaned up that_canadian keymap commentsThat-Canadian2017-07-101-3/+3
| * | | | Merge branch 'master' into minidoxThat-Canadian2017-07-1059-2980/+898
| |\ \ \ \
| * | | | | Updated minidox rev1 config, and readme. Also updated that_canadian keymap to...That-Canadian2017-07-105-12/+45
| * | | | | Added MiniDox keyboard folder / configs / and some keymapsThat-Canadian2017-07-1021-0/+1831
* | | | | | Updated i2c and serial files to most recent from the lets split firmware. Als...That-Canadian2017-07-147-7/+31
| |_|/ / / |/| | | |
* | | | | Merge remote-tracking branch 'upstream/master'That-Canadian2017-07-1023-0/+1865
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Adds Minidox Keyboard (#1487)That-Canadian2017-07-1023-0/+1865
* | | | Merge remote-tracking branch 'upstream/master'That-Canadian2017-07-1059-2980/+898
|\| | | | |/ / |/| |
| * | Update README.mdJack Humbert2017-07-101-1/+1
| * | Start mvoing hardware drivers to /drivers/ (#1433)Jack Humbert2017-07-1019-1582/+13
| * | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-07-1040-1397/+884
| |\ \
| | * | Fix uninitialized backlight_level in the VisualizerFred Sundvik2017-07-101-0/+4
| | * | Add template board filesFred Sundvik2017-07-102-0/+223
| | * | Rename board files to lowercaseFred Sundvik2017-07-105-2/+2
| | * | Make it easier to use driversFred Sundvik2017-07-1015-45/+58
| | * | Shared default animationsFred Sundvik2017-07-1010-171/+35
| | * | Clarify naming between LCD_BACKLIGHT and LED_BACKLIGHTFred Sundvik2017-07-109-73/+73
| | * | Shared gfxconfFred Sundvik2017-07-104-598/+330
| | * | Define visualizer thread priority by defaultFred Sundvik2017-07-103-6/+3
| | * | Fixup mixed tabs/spacesFred Sundvik2017-07-105-154/+154
| | * | Remove ergodox from gdisp driver namesFred Sundvik2017-07-1013-11/+11
| | * | Move GDISP drivers to /drivers/ugfxFred Sundvik2017-07-1017-360/+10
| | * | Fix Makefile error_occured output for unit testsFred Sundvik2017-07-101-0/+2
| | * | Don't search for TEENSY_LOADER_CLI if it's already definedFred Sundvik2017-07-101-5/+7
| | * | Don't run dfu-programmer unless specified as a targetFred Sundvik2017-07-101-10/+10
| | |/
| * | Merge commit '8858438a770c1c982f33b296447ca77176c751f7'Jack Humbert2017-07-096-407/+407
| |\ \ | | |/ | |/|