diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-08 16:38:27 +0300 |
| commit | be5c498b723efa8f8e02332e5af40ea0214b0fb7 (patch) | |
| tree | fac99de033373d1870177433b93eb065132413d1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml | |
| parent | ddf8b4ad6edff6b9ac1e80d0a55cff5edb06a3e8 (diff) | |
| parent | a610818fef1bafdd75ab904d19fa7f206942ce97 (diff) | |
| download | Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.tar.gz Tango-be5c498b723efa8f8e02332e5af40ea0214b0fb7.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml')
0 files changed, 0 insertions, 0 deletions