3 Commits

Author	SHA1	Message	Date
Jordan Hall	9d3a0a160f	Merging with master and resolving conflicts	2013-08-11 00:08:48 +01:00
Jonathan Warren	d036ca18ed	Completed chan integration in the GUI	2013-07-22 01:10:22 -04:00
Jonathan Warren	8bd00dc730	added newchandialog.py	2013-06-25 17:14:44 -04:00