]> git.donarmstrong.com Git - qmk_firmware.git/commit - keyboard/retro_refit/Makefile
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
authorIBNobody <protospherex@gmail.com>
Wed, 23 Mar 2016 01:39:05 +0000 (20:39 -0500)
committerIBNobody <protospherex@gmail.com>
Wed, 23 Mar 2016 01:39:05 +0000 (20:39 -0500)
commitec62d9e85cab5cf166241b0536120d005fa7c898
tree5b2a544070d80833bb7668ffc34dc3143b62a3d5
parent8a2457d7534ba082b52599e3af56f9e50e8dc38a
parent403d756ad56de18488e3d048e849c55e77a20b32
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
quantum/template/template.c
quantum/template/template.h