Merge branch 'master' of github.com:vvvv/SVG
Conflicts: Samples/SVGViewer/SVGViewer.csproj Samples/SVGViewer/SvgViewer.Designer.cs Samples/SVGViewer/SvgViewer.cs Samples/SVGViewer/SvgViewer.resx Samples/SVGViewer/app.config
Showing
+32 -1123
Samples/.gitignore
0 → 100644
Samples/SVGViewer/Backup/Program.cs
deleted
100644 → 0
Samples/SVGViewer/NoImage.png
0 → 100644
+ 0
- 0
9.53 KB
Samples/SVGViewer/SVGViewer.suo
deleted
100644 → 0
+ 0
- 0
File deleted
Samples/SVGViewer/UpgradeLog.XML
deleted
100644 → 0
+ 0
- 0
69 Bytes
+ 0
- 0
71 Bytes