Chemical-PFD/.git -

Age	Commit message (Expand)	Author
2020-06-03	sort col points	Blaine
2020-06-03	fix2	Blaine
2020-06-03	merge conflicts	Blaine
2020-06-03	fix shapes	Blaine
2020-06-03	conflict resolution	Blaine
2020-06-03	conflict resolution	Blaine
2020-06-03	Merge remote-tracking branch 'upstream/master'	sumit
2020-06-03	curve fix for line from right to left	sumit
2020-06-02	Merge branch 'merge'	Blaine
2020-06-02	bring upstream branch up to date.	Blaine
2020-06-02	checkkk	Blaine
2020-06-02	minor typo	Blaine
2020-06-02	loop 2nd fix	Blaine
2020-06-02	reverse dir fix	Blaine
2020-06-02	line working	Blaine
2020-06-02	update end point of line	sumit
2020-06-02	undo delete shapes.py	sumit
2020-06-02	remove shapes.py from pull request	Sumit-Sahu
2020-06-02	add text label to line	sumit
2020-05-31	add variable commonPaths	sumit
2020-05-31	common path of lines	sumit
2020-05-30	change add line for undo	sumit
2020-05-30	remove extra point of line	sumit
2020-05-28	Merge branch 'master' of https://github.com/Blakeinstein/Chemical-PFD	Blaine
2020-05-28	test code	Blaine
2020-05-28	customScene collision boilerplate	Blaine
2020-05-28	open svg from resources	sumit
2020-05-28	Merge remote-tracking branch 'upstream/master'	sumit
2020-05-28	Merge branch 'master' into master	Blaine
2020-05-28	add ellipse	Blaine
2020-05-28	upstream undo	Blaine
2020-05-28	change final shape of line	sumit
2020-05-27	commit undo modification	Blaine
2020-05-27	merge-commit 2	Blaine
2020-05-27	update drag and drop for streamlined merge	Blaine
2020-05-25	week 5 refactor	Blaine
2020-05-22	rename funcs to app, and fix toolbar resizing	Blaine
2020-05-22	migrate to json in data.py and use custom icons	Blaine
2020-05-21	migrate to json	Blaine
2020-05-21	svg origin at center and size grip as child	sumit
2020-05-21	Merge remote-tracking branch 'upstream/master'	sumit
2020-05-21	add class for pfd-symbols	sumit
2020-05-20	undo stack, form layout to box	Blaine
2020-05-20	cleanup	sumit
2020-05-19	clean up'	sumit
2020-05-19	Delete svghandler.py	Sumit-Sahu
2020-05-19	clean up and add comments	sumit
2020-05-19	undo redo complete	Blaine
2020-05-19	helper commit to merge shapes	Blaine
2020-05-18	Rename shapes.py to src/main/python/shapes/shapes.py	Sumit-Sahu