Skip to content

Commit

Permalink
Merge with v6.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
skyrpex committed Apr 1, 2015
1 parent 5bed6d1 commit 0c038e4
Show file tree
Hide file tree
Showing 120 changed files with 9,810 additions and 4,323 deletions.
4 changes: 2 additions & 2 deletions C#/ConsoleDemo/ConsoleDemo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("ClipperTest1")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyCompany("Angus Johnson")]
[assembly: AssemblyProduct("ClipperTest1")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
[assembly: AssemblyCopyright("Copyright © Angus Johnson 2010-14")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
1,142 changes: 564 additions & 578 deletions C#/GuiDemo/GuiDemo/Form1.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion C#/GuiDemo/GuiDemo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Angus Johnson")]
[assembly: AssemblyProduct("ClipperCSharpDemo1")]
[assembly: AssemblyCopyright("Copyright © Angus Johnson 2010")]
[assembly: AssemblyCopyright("Copyright © Angus Johnson 2010-14")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions C#/clipper_library/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("clipper_library")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyCompany("Angus Johnson")]
[assembly: AssemblyProduct("clipper_library")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
[assembly: AssemblyCopyright("Copyright © Angus Johnson 2010-14")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Loading

0 comments on commit 0c038e4

Please sign in to comment.