HCoop
/
jackhill
/
qmk
/
firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a41a7a9
8e00c46
)
Merge branch 'master'
author
Jason Janse van Rensburg
<l33tjas.0n@gmail.com>
Tue, 30 Aug 2016 12:54:00 +0000
(14:54 +0200)
committer
Jason Janse van Rensburg
<l33tjas.0n@gmail.com>
Tue, 30 Aug 2016 12:54:00 +0000
(14:54 +0200)
Conflicts:
keyboards/planck/keymaps/bone2planck/keymap.c
1
2
keyboards/planck/keymaps/bone2planck/keymap.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
keyboards/planck/keymaps/bone2planck/keymap.c
Simple merge