Commit graph

2 commits

Author SHA1 Message Date
Laptop 4ff00bfb95 update two files from merge
Merge branch 'master' of https://github.com/cnlohr/colorchord

Conflicts:
	Makefile
	default.conf
2015-06-26 16:59:44 -04:00
Laptop 1e2cae4fbb add test for recording 2015-06-26 15:38:09 -04:00