From 4e41d10b06091aa90f080e246afd06c279ed5ef4 Mon Sep 17 00:00:00 2001 From: james jones Date: Fri, 27 Jun 2014 18:18:00 -0700 Subject: [PATCH] Getting it working with vs 2013. --- DataStorage/SQLiteWin32.cs | 6 +++--- MatterControl.sln | 27 ++++++++++++++++++++++++++- StaticData/Translations/Master.txt | 6 ++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/DataStorage/SQLiteWin32.cs b/DataStorage/SQLiteWin32.cs index 80ac58d3e..bd918b621 100644 --- a/DataStorage/SQLiteWin32.cs +++ b/DataStorage/SQLiteWin32.cs @@ -29,9 +29,9 @@ using System.Linq.Expressions; using System.Threading; #if USE_CSHARP_SQLITE -//using Community.CsharpSqlite; -//using Sqlite3DatabaseHandle = Community.CsharpSqlite.Sqlite3.sqlite3; -//using Sqlite3Statement = Community.CsharpSqlite.Sqlite3.Vdbe; +using Community.CsharpSqlite; +using Sqlite3DatabaseHandle = Community.CsharpSqlite.Sqlite3.sqlite3; +using Sqlite3Statement = Community.CsharpSqlite.Sqlite3.Vdbe; #else using Sqlite3DatabaseHandle = System.IntPtr; using Sqlite3Statement = System.IntPtr; diff --git a/MatterControl.sln b/MatterControl.sln index ad39150e8..9d4ccac27 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -1,9 +1,34 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{0B8D6F56-BD7F-4426-B858-D9292B084656}" ProjectSection(ProjectDependencies) = postProject + {F67AE800-B0C7-42A8-836F-597B4E74591C} = {F67AE800-B0C7-42A8-836F-597B4E74591C} + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} + {F1653F20-D47D-4F29-8C55-3C835542AF5F} = {F1653F20-D47D-4F29-8C55-3C835542AF5F} + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} = {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95} + {D3ABF72C-64C2-4E51-A119-E077210FA990} = {D3ABF72C-64C2-4E51-A119-E077210FA990} + {3DF4CB3D-9A03-4256-9A81-70523AAD828B} = {3DF4CB3D-9A03-4256-9A81-70523AAD828B} + {C958F745-156E-4BDC-A24A-3721C7BE7B8A} = {C958F745-156E-4BDC-A24A-3721C7BE7B8A} + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} + {A526DC5D-65F3-461B-805F-D3AC9665F5C9} = {A526DC5D-65F3-461B-805F-D3AC9665F5C9} + {74F6BB6C-9D02-4512-A59A-21940E35C532} = {74F6BB6C-9D02-4512-A59A-21940E35C532} {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} + {9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {9B062971-A88E-4A3D-B3C9-12B78D15FA66} + {A737BC76-165B-46C6-82B7-8871C7C92942} = {A737BC76-165B-46C6-82B7-8871C7C92942} + {CA96058C-1A37-465D-A357-D6D695B13D25} = {CA96058C-1A37-465D-A357-D6D695B13D25} + {865172A0-A1A9-49C2-9386-F2FDB4E141B7} = {865172A0-A1A9-49C2-9386-F2FDB4E141B7} + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} = {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} + {036BCCBA-52D8-457C-84AE-8821F209FE4A} = {036BCCBA-52D8-457C-84AE-8821F209FE4A} + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} + {DF6845CD-64C6-4263-8357-DA8066855739} = {DF6845CD-64C6-4263-8357-DA8066855739} + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9} = {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9} + {1E01ABE0-B494-4FE4-B0D6-540133286887} = {1E01ABE0-B494-4FE4-B0D6-540133286887} + {86F6AAF2-9B50-40B8-A427-1897D76471C5} = {86F6AAF2-9B50-40B8-A427-1897D76471C5} + {670BDDFF-927B-425D-9DD1-22ACB14356EB} = {670BDDFF-927B-425D-9DD1-22ACB14356EB} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tesselate", "..\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}" diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 75aea6d06..52833170e 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2481,3 +2481,9 @@ Translated:Exporting to Folder English:Warning GCode file Translated:Warning GCode file +English:Release Notes +Translated:Release Notes + +English:More Info +Translated:More Info +