3 Commits

Author	SHA1	Message	Date
Jim Evins	73b7475cbc	Finished fleshing out MergeView for now.	2016-05-14 13:25:24 -04:00
Jim Evins	2ff07f01b3	Continued to flesh out merge subsystem.	2016-05-01 22:42:03 -04:00
Jim Evins	004fb03325	Some reconciling of widget naming conventions.	2016-04-16 18:53:55 -04:00