]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge remote-tracking branch 'upstream/master'
authordbroqua <dbroqua@mousur.org>
Tue, 23 Aug 2016 11:39:49 +0000 (13:39 +0200)
committerdbroqua <dbroqua@mousur.org>
Tue, 23 Aug 2016 11:39:49 +0000 (13:39 +0200)
commite65252d591b88f3c108d40ea5eeda9d561bc237c
tree6e43f93f62aef905c2c5beeb46ef37a18c38e7e0
parent92fe78a5ea98cc8ca36d74ce86c24fe284729c39
parentfb4452c2f5a80720fd56306ea4fa7c61a5e8040d
Merge remote-tracking branch 'upstream/master'

# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c