merge of SRMM related changes into stable

6 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Import/src/dbrw/dbcontacts.cpp b/plugins/Import/src/dbrw/dbcontacts.cpp
index 66ffcb61b9..03780e7e9e 100644
--- a/plugins/Import/src/dbrw/dbcontacts.cpp
+++ b/plugins/Import/src/dbrw/dbcontacts.cpp
@@ -65,4 +65,4 @@ STDMETHODIMP_(MCONTACT) CDbxSQLite::AddContact(void)
 STDMETHODIMP_(LONG) CDbxSQLite::DeleteContact(MCONTACT)
 {
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/plugins/Import/src/dbrw/dbevents.cpp b/plugins/Import/src/dbrw/dbevents.cpp
index cc8c04c5b3..062cc79069 100644
--- a/plugins/Import/src/dbrw/dbevents.cpp
+++ b/plugins/Import/src/dbrw/dbevents.cpp
@@ -181,4 +181,4 @@ STDMETHODIMP_(MEVENT) CDbxSQLite::FindPrevEvent(MCONTACT contactID, MEVENT hDbEv
 		res = sqlite3_column_int(evt_stmts_prep[SQL_EVT_STMT_FINDPREV], 0);
 	sql_reset(evt_stmts_prep[SQL_EVT_STMT_FINDPREV]);
 	return res;
-}
\ No newline at end of file
+}
diff --git a/plugins/Import/src/dbrw/dbintf.cpp b/plugins/Import/src/dbrw/dbintf.cpp
index 137b79aaa9..b5ed8b9e67 100644
--- a/plugins/Import/src/dbrw/dbintf.cpp
+++ b/plugins/Import/src/dbrw/dbintf.cpp
@@ -82,4 +82,4 @@ STDMETHODIMP_(BOOL) CDbxSQLite::MetaMergeHistory(DBCachedContact*, DBCachedConta
 STDMETHODIMP_(BOOL) CDbxSQLite::MetaSplitHistory(DBCachedContact*, DBCachedContact*)
 {
 	return FALSE;
-}
\ No newline at end of file
+}
diff --git a/plugins/Import/src/dbrw/dbrw.cpp b/plugins/Import/src/dbrw/dbrw.cpp
index 00bf079c05..60765d8f4a 100644
--- a/plugins/Import/src/dbrw/dbrw.cpp
+++ b/plugins/Import/src/dbrw/dbrw.cpp
@@ -97,4 +97,4 @@ static DATABASELINK dblink =
 void RegisterDbrw()
 {
 	RegisterDatabasePlugin(&dblink);
-}
\ No newline at end of file
+}
diff --git a/plugins/Import/src/dbrw/dbrw.h b/plugins/Import/src/dbrw/dbrw.h
index 45034fcf3c..cbd09b66a1 100644
--- a/plugins/Import/src/dbrw/dbrw.h
+++ b/plugins/Import/src/dbrw/dbrw.h
@@ -27,4 +27,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DBRW_SCHEMA_VERSION      "2"
 #define DBRW_HEADER_STR          "SQLite format 3"
 
-void RegisterDbrw();
\ No newline at end of file
+void RegisterDbrw();
diff --git a/plugins/Import/src/dbrw/dbsettings.cpp b/plugins/Import/src/dbrw/dbsettings.cpp
index 64501078c6..ff8060b7fe 100644
--- a/plugins/Import/src/dbrw/dbsettings.cpp
+++ b/plugins/Import/src/dbrw/dbsettings.cpp
@@ -178,4 +178,4 @@ STDMETHODIMP_(BOOL) CDbxSQLite::EnumContactSettings(MCONTACT hContact, DBSETTING
 	}
 	sql_reset(set_stmts_prep[SQL_SET_STMT_ENUM]);
 	return res;
-}
\ No newline at end of file
+}