aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-03-01 17:47:27 +0200
committerAvi Levkovich <avi@twine-s.com>2020-03-01 17:47:27 +0200
commit6c1f8f8df6b9ee71104098f548ba8be8504fc89b (patch)
treefc0948888bb5dc156341f73d82306b26cc8523df /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
parent046fce068413ae04454d07a0fd591bb200b30eef (diff)
parent2c0f48e170634b93daa75abda4e246e85ffed519 (diff)
downloadTango-6c1f8f8df6b9ee71104098f548ba8be8504fc89b.tar.gz
Tango-6c1f8f8df6b9ee71104098f548ba8be8504fc89b.zip
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs')
0 files changed, 0 insertions, 0 deletions