]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7b44dc e7df488)
Merged from upstream
authorJoshua T <joshua@sonofone.net>
Sat, 7 Jan 2017 20:01:21 +0000 (14:01 -0600)
committerJoshua T <joshua@sonofone.net>
Sat, 7 Jan 2017 20:01:21 +0000 (14:01 -0600)
1  2 
keyboards/ergodox/config.h patch | diff1 | diff2 | blob | history

diff --cc keyboards/ergodox/config.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.