diff options
| author | Michael <[email protected]> | 2017-06-17 15:53:54 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-06-17 15:53:54 -0400 |
| commit | 14efc1fb56c0f9232c3c6097da4f69870ec55bcd (patch) | |
| tree | 22c48b506c3aef6218f37f3a50a87228f27f4085 /ShiftOS.WinForms/WinformsDesktop.Designer.cs | |
| parent | e3f9a6028b3774f7376617502e7f6016dc50dd0e (diff) | |
| parent | 8862820bf36719d0e1a1defa19495dc2ccb4cfc1 (diff) | |
| download | shiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.tar.gz shiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.tar.bz2 shiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.zip | |
merge conflicts
Diffstat (limited to 'ShiftOS.WinForms/WinformsDesktop.Designer.cs')
0 files changed, 0 insertions, 0 deletions