]> git.donarmstrong.com Git - qmk_firmware.git/commit - keyboards/ergodox/keymaps/videck/config.h
merge upstream/master
authorSeth Chandler <sethbc@sethbc.org>
Sat, 19 Nov 2016 16:20:41 +0000 (11:20 -0500)
committerSeth Chandler <sethbc@sethbc.org>
Sat, 19 Nov 2016 16:20:41 +0000 (11:20 -0500)
commitac7d202d4f143b19719b13c28177cee500896bca
treeda08924cdf89b91219dc4440b5e839fe594763b6
parentb2bc215934ddd31315db4304223750aee3eaf38d
parenta06115df19a74d39b08758472b221e630c3680d3
merge upstream/master