Merge tag 'upstream/3.0.6'

Upstream version 3.0.6

# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 3 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/csvformat.h b/SQLiteStudio3/coreSQLiteStudio/csvformat.h
index c569147..5ce00ad 100644
--- a/SQLiteStudio3/coreSQLiteStudio/csvformat.h
+++ b/SQLiteStudio3/coreSQLiteStudio/csvformat.h
@@ -8,9 +8,12 @@ struct API_EXPORT CsvFormat
 {
     CsvFormat();
     CsvFormat(const QString& columnSeparator, const QString& rowSeparator);
+    CsvFormat(const QString& columnSeparator, const QString& rowSeparator, bool strictRowSeparator, bool strictColumnSeparator);
 
     QString columnSeparator;
     QString rowSeparator;
+    bool strictColumnSeparator = false;
+    bool strictRowSeparator = false;
 
     static const CsvFormat DEFAULT;
 };