summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-03conflict resolutionBlaine
2020-06-03conflict resolutionBlaine
2020-06-03Merge remote-tracking branch 'upstream/master'sumit
2020-06-03Merge pull request #6 from Blakeinstein/masterpravindalve
2020-06-03curve fix for line from right to leftsumit
2020-06-02Merge branch 'merge'Blaine
2020-06-02bring upstream branch up to date.Blaine
2020-06-02checkkkBlaine
2020-06-02minor typoBlaine
2020-06-02loop 2nd fixBlaine
2020-06-02Merge pull request #2 from Sumit-Sahu/loopsBlaine
2020-06-02reverse dir fixBlaine
2020-06-02Merge pull request #1 from Sumit-Sahu/loopsSumit-Sahu
2020-06-02line workingBlaine
2020-06-02update end point of linesumit
2020-06-02undo delete shapes.pysumit
2020-06-02Merge branch 'master' of https://github.com/Sumit-Sahu/Chemical-PFDsumit
2020-06-02add text label for linesumit
2020-06-02remove shapes.py from pull requestSumit-Sahu
2020-06-02add text label to linesumit
2020-05-31add variable commonPathssumit
2020-05-31common path of linessumit
2020-05-30change add line for undosumit
2020-05-30remove extra point of linesumit
2020-05-28Merge branch 'master' of https://github.com/Blakeinstein/Chemical-PFDBlaine
2020-05-28test codeBlaine
2020-05-28customScene collision boilerplateBlaine
2020-05-28open svg from resourcessumit
2020-05-28Merge remote-tracking branch 'upstream/master'sumit
2020-05-28Merge pull request #4 from Blakeinstein/masterpravindalve
2020-05-28Merge branch 'master' into masterBlaine
2020-05-28add ellipseBlaine
2020-05-28upstream undoBlaine
2020-05-28Merge branch 'master' of https://github.com/Sumit-Sahu/Chemical-PFDsumit
2020-05-28change final shape of linesumit
2020-05-27commit undo modificationBlaine
2020-05-27merge-commit 2Blaine
2020-05-27update drag and drop for streamlined mergeBlaine
2020-05-25week 5 refactorBlaine
2020-05-22rename funcs to app, and fix toolbar resizingBlaine
2020-05-22migrate to json in data.py and use custom iconsBlaine
2020-05-21migrate to jsonBlaine
2020-05-21Merge pull request #3 from Sumit-Sahu/masterpravindalve
2020-05-21Update .gitignoreSumit-Sahu
2020-05-21add .idea/sumit
2020-05-21svg origin at center and size grip as childsumit
2020-05-21Merge remote-tracking branch 'upstream/master'sumit
2020-05-21add class for pfd-symbolssumit
2020-05-20undo stack, form layout to boxBlaine
2020-05-20cleanupsumit
generated by cgit (git 2.34.1) at 2024-12-20 13:57:35 +0000