# WARNING: head commit changed in the meantime

Merge branch 'timer1-outsource-452'

Conflicts:
	timer.c
	timer.cof
	timer.esym
	timer.hex
	timer.lst
correcoes