git.friedersdorff.com Git - max/tmk_keyboard.git/commit

]> git.friedersdorff.com Git - max/tmk_keyboard.git/commit

projects / max / tmk_keyboard.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eb90ed6 60096e1)

author	tmk <nobody@nowhere>
	Mon, 24 Nov 2014 04:50:33 +0000 (13:50 +0900)
committer	tmk <nobody@nowhere>
	Mon, 24 Nov 2014 04:50:33 +0000 (13:50 +0900)
commit	363950982a291c3bfa03ac6362061b1d37dc06b0
tree	c46fc53fe00137ced3c8edd3d0766ee844f77516	tree \| snapshot
parent	eb90ed6238426db9367e294abfaefb5de07564f5	commit \| diff
parent	60096e11c77980ca6b54674c5b68248e8aa15d8d	commit \| diff

Merge branch 'rn42' into merge_rn42

Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h

.gitignore	diff1 \|	diff2 \|	blob \| history
common.mk	diff1 \|	diff2 \|	blob \| history
common/action.c	diff1 \|	diff2 \|	blob \| history
common/avr/xprintf.h	diff1 \|	diff2 \|	blob \| history
common/debug.h	diff1 \|	diff2 \|	blob \| history
common/keyboard.c	diff1 \|	diff2 \|	blob \| history
protocol.mk	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.