Kevin Larke 901f764d16 doc/notes.txt : Resolved merge conflicts.		2015-07-24 10:53:02 -07:00
..
Diagram1.dia	Diagram1.dia : Added note on cross-fade parameter order and timing.	2013-12-12 12:11:47 -05:00
notes.txt	doc/notes.txt : Resolved merge conflicts.	2015-07-24 10:53:02 -07:00