{"shas":[["49ef9b038397c09e5db4bab7cf32c00d6bad42e4","42719bbf98f419d19285f0068a622ce0d5e742c9@gmail.com","First commit after changes ready for merging together with the version on git hub","lski"],["97063af751ddbdac152aaf07ea92600f4739b8bf","42719bbf98f419d19285f0068a622ce0d5e742c9@gmail.com","Merge branch 'master' of github.com:lski/Toolbox\n\nConflicts:\n\tToolbox.GUI/Controls/TextBoxWithDefault.cs\n\tToolbox.GUI/Dialog/DisplayData.cs\n\tToolbox.GUI/Printing/PrintDoc.cs\n\tToolbox.NPOI/Toolbox.NPOI.csproj\n\tToolbox.Web/Locations.cs\n\tToolbox.Web/WebMethods.cs\n\tToolbox.sln\n\tToolbox/ADO/Connections.cs\n\tToolbox/ADO/DataTableNavigation.cs\n\tToolbox/ADO/DbFactoryProvider/AccessFactory.cs\n\tToolbox/ADO/DbFactoryProvider/DbFactoryProvider.cs\n\tToolbox/ADO/DbFactoryProvider/FoxProFactory.cs\n\tToolbox/ADO/DbFactoryProvider/OleFactory.cs\n\tToolbox/ADO/DbFactoryProvider/Sql2005Factory.cs\n\tToolbox/ADO/DbFactoryProvider/SqlFactory.cs\n\tToolbox/ADO/Extensions/DataTable.cs\n\tToolbox/ADO/IO/Csv/CsvExport.cs\n\tToolbox/ADO/IO/Csv/CsvImport.cs\n\tToolbox/ADO/ORM/Schema/FieldSchema.cs\n\tToolbox/ADO/ORM/Schema/TableSchema.cs\n\tToolbox/ADO/PropertyDescriptor.cs\n\tToolbox/ADO/SelectBuilder.cs\n\tToolbox/Logging/Logger.cs\n\tToolbox/Logging/RawTextLogger.cs\n\tToolbox/Logging/XmlLogger.cs\n\tToolbox/Misc/Address.cs\n\tToolbox/Misc/LineF.cs\n\tToolbox/Toolbox.csproj","lski"]],"ref":"refs/heads/master","size":2,"head":"97063af751ddbdac152aaf07ea92600f4739b8bf","push_id":37525345}