Merge branch 'master' of https://github.com/miranda-ng/miranda-ng

65 files changed, 0 insertions, 0 deletions

diff --git a/plugins/Alarms/res/resource.rc b/plugins/Alarms/res/resource.rc
index 7ec19f1851..7ec19f1851 100755..100644
--- a/plugins/Alarms/res/resource.rc
+++ b/plugins/Alarms/res/resource.rc
diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index 2a2627c8c9..2a2627c8c9 100755..100644
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
diff --git a/plugins/Alarms/src/alarmlist.h b/plugins/Alarms/src/alarmlist.h
index f1bb2f61d0..f1bb2f61d0 100755..100644
--- a/plugins/Alarms/src/alarmlist.h
+++ b/plugins/Alarms/src/alarmlist.h
diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp
index 987ccb5f7e..987ccb5f7e 100755..100644
--- a/plugins/Alarms/src/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index 1f7fbb429f..1f7fbb429f 100755..100644
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
diff --git a/plugins/Alarms/src/resource.h b/plugins/Alarms/src/resource.h
index 790f66e72b..790f66e72b 100755..100644
--- a/plugins/Alarms/src/resource.h
+++ b/plugins/Alarms/src/resource.h
diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index 0e479358fa..0e479358fa 100755..100644
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
diff --git a/plugins/Alarms/src/version.h b/plugins/Alarms/src/version.h
index 682c6f7df3..682c6f7df3 100755..100644
--- a/plugins/Alarms/src/version.h
+++ b/plugins/Alarms/src/version.h
diff --git a/plugins/Dbx_sqlite/src/dbcontacts.cpp b/plugins/Dbx_sqlite/src/dbcontacts.cpp
index 8ea6d122ae..8ea6d122ae 100755..100644
--- a/plugins/Dbx_sqlite/src/dbcontacts.cpp
+++ b/plugins/Dbx_sqlite/src/dbcontacts.cpp
diff --git a/plugins/Dbx_sqlite/src/dbevents.cpp b/plugins/Dbx_sqlite/src/dbevents.cpp
index 155b32dc70..155b32dc70 100755..100644
--- a/plugins/Dbx_sqlite/src/dbevents.cpp
+++ b/plugins/Dbx_sqlite/src/dbevents.cpp
diff --git a/plugins/Dbx_sqlite/src/dbintf.cpp b/plugins/Dbx_sqlite/src/dbintf.cpp
index 16d7ca8783..16d7ca8783 100755..100644
--- a/plugins/Dbx_sqlite/src/dbintf.cpp
+++ b/plugins/Dbx_sqlite/src/dbintf.cpp
diff --git a/plugins/Dbx_sqlite/src/dbintf.h b/plugins/Dbx_sqlite/src/dbintf.h
index e0f74a165e..e0f74a165e 100755..100644
--- a/plugins/Dbx_sqlite/src/dbintf.h
+++ b/plugins/Dbx_sqlite/src/dbintf.h
diff --git a/plugins/Dbx_sqlite/src/dbsettings.cpp b/plugins/Dbx_sqlite/src/dbsettings.cpp
index b4b5551cea..b4b5551cea 100755..100644
--- a/plugins/Dbx_sqlite/src/dbsettings.cpp
+++ b/plugins/Dbx_sqlite/src/dbsettings.cpp
diff --git a/plugins/ExternalAPI/m_alarms.h b/plugins/ExternalAPI/m_alarms.h
index 83360901a2..83360901a2 100755..100644
--- a/plugins/ExternalAPI/m_alarms.h
+++ b/plugins/ExternalAPI/m_alarms.h
diff --git a/plugins/MimCmd/src/MimCmd.cpp b/plugins/MimCmd/src/MimCmd.cpp
index 5b7bde1b96..5b7bde1b96 100755..100644
--- a/plugins/MimCmd/src/MimCmd.cpp
+++ b/plugins/MimCmd/src/MimCmd.cpp
diff --git a/plugins/MimCmd/src/commands.cpp b/plugins/MimCmd/src/commands.cpp
index ec18b162f3..ec18b162f3 100755..100644
--- a/plugins/MimCmd/src/commands.cpp
+++ b/plugins/MimCmd/src/commands.cpp
diff --git a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
index 783dcf359b..783dcf359b 100755..100644
--- a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
+++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
diff --git a/plugins/Msg_Export/res/export_m.ico b/plugins/Msg_Export/res/export_m.ico
index 8953e0665f..8953e0665f 100755..100644
--- a/plugins/Msg_Export/res/export_m.ico
+++ b/plugins/Msg_Export/res/export_m.ico
diff --git a/plugins/Msg_Export/res/notick.ico b/plugins/Msg_Export/res/notick.ico
index 7f93490642..7f93490642 100755..100644
--- a/plugins/Msg_Export/res/notick.ico
+++ b/plugins/Msg_Export/res/notick.ico
diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc
index d9869428a6..d9869428a6 100755..100644
--- a/plugins/Msg_Export/res/resource.rc
+++ b/plugins/Msg_Export/res/resource.rc
diff --git a/plugins/Msg_Export/res/tick.ico b/plugins/Msg_Export/res/tick.ico
index 609504d614..609504d614 100755..100644
--- a/plugins/Msg_Export/res/tick.ico
+++ b/plugins/Msg_Export/res/tick.ico
diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index 6390f435e1..6390f435e1 100755..100644
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
diff --git a/plugins/Msg_Export/src/FileViewer.h b/plugins/Msg_Export/src/FileViewer.h
index 400938080e..400938080e 100755..100644
--- a/plugins/Msg_Export/src/FileViewer.h
+++ b/plugins/Msg_Export/src/FileViewer.h
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp
index 7eb98a030b..7eb98a030b 100755..100644
--- a/plugins/Msg_Export/src/main.cpp
+++ b/plugins/Msg_Export/src/main.cpp
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 90f87f8067..90f87f8067 100755..100644
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
diff --git a/plugins/Msg_Export/src/options.h b/plugins/Msg_Export/src/options.h
index e0de020b0f..e0de020b0f 100755..100644
--- a/plugins/Msg_Export/src/options.h
+++ b/plugins/Msg_Export/src/options.h
diff --git a/plugins/Msg_Export/src/resource.h b/plugins/Msg_Export/src/resource.h
index 77919cd84f..77919cd84f 100755..100644
--- a/plugins/Msg_Export/src/resource.h
+++ b/plugins/Msg_Export/src/resource.h
diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h
index 24989198aa..24989198aa 100755..100644
--- a/plugins/Msg_Export/src/stdafx.h
+++ b/plugins/Msg_Export/src/stdafx.h
diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 7a67870ed2..7a67870ed2 100755..100644
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h
index 8e50aeff9a..8e50aeff9a 100755..100644
--- a/plugins/Msg_Export/src/utils.h
+++ b/plugins/Msg_Export/src/utils.h
diff --git a/plugins/New_GPG/src/globals.h b/plugins/New_GPG/src/globals.h
index 02b1607b6d..02b1607b6d 100755..100644
--- a/plugins/New_GPG/src/globals.h
+++ b/plugins/New_GPG/src/globals.h
diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp
index 6b719e1e5e..6b719e1e5e 100755..100644
--- a/plugins/New_GPG/src/gpg_wrapper.cpp
+++ b/plugins/New_GPG/src/gpg_wrapper.cpp
diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index a3c7614803..a3c7614803 100755..100644
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index cbcf08c80b..cbcf08c80b 100755..100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
diff --git a/plugins/New_GPG/src/log.cpp b/plugins/New_GPG/src/log.cpp
index 7fa5caf3a0..7fa5caf3a0 100755..100644
--- a/plugins/New_GPG/src/log.cpp
+++ b/plugins/New_GPG/src/log.cpp
diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index bcaafe6ac0..bcaafe6ac0 100755..100644
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index f79d09361c..f79d09361c 100755..100644
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 5dd4c3d03c..5dd4c3d03c 100755..100644
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
diff --git a/plugins/New_GPG/src/options.h b/plugins/New_GPG/src/options.h
index 45c92f914a..45c92f914a 100755..100644
--- a/plugins/New_GPG/src/options.h
+++ b/plugins/New_GPG/src/options.h
diff --git a/plugins/New_GPG/src/srmm.cpp b/plugins/New_GPG/src/srmm.cpp
index 589dda598d..589dda598d 100755..100644
--- a/plugins/New_GPG/src/srmm.cpp
+++ b/plugins/New_GPG/src/srmm.cpp
diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h
index 3553a65c41..3553a65c41 100755..100644
--- a/plugins/New_GPG/src/stdafx.h
+++ b/plugins/New_GPG/src/stdafx.h
diff --git a/plugins/New_GPG/src/ui.cpp b/plugins/New_GPG/src/ui.cpp
index f56c876d71..f56c876d71 100755..100644
--- a/plugins/New_GPG/src/ui.cpp
+++ b/plugins/New_GPG/src/ui.cpp
diff --git a/plugins/New_GPG/src/ui.h b/plugins/New_GPG/src/ui.h
index 1e30441b83..1e30441b83 100755..100644
--- a/plugins/New_GPG/src/ui.h
+++ b/plugins/New_GPG/src/ui.h
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 7f6346f6ed..7f6346f6ed 100755..100644
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
diff --git a/plugins/New_GPG/src/utilities.h b/plugins/New_GPG/src/utilities.h
index 1ac119660d..1ac119660d 100755..100644
--- a/plugins/New_GPG/src/utilities.h
+++ b/plugins/New_GPG/src/utilities.h
diff --git a/plugins/New_GPG/src/version.h b/plugins/New_GPG/src/version.h
index 0a632f9ee9..0a632f9ee9 100755..100644
--- a/plugins/New_GPG/src/version.h
+++ b/plugins/New_GPG/src/version.h
diff --git a/plugins/StopSpamMod/res/stopspam.rc b/plugins/StopSpamMod/res/stopspam.rc
index 950de7995c..950de7995c 100755..100644
--- a/plugins/StopSpamMod/res/stopspam.rc
+++ b/plugins/StopSpamMod/res/stopspam.rc
diff --git a/plugins/StopSpamMod/src/globals.h b/plugins/StopSpamMod/src/globals.h
index c54341325e..c54341325e 100755..100644
--- a/plugins/StopSpamMod/src/globals.h
+++ b/plugins/StopSpamMod/src/globals.h
diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp
index 45323d770b..45323d770b 100755..100644
--- a/plugins/StopSpamMod/src/init.cpp
+++ b/plugins/StopSpamMod/src/init.cpp
diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp
index b7f8fc1274..b7f8fc1274 100755..100644
--- a/plugins/StopSpamMod/src/options.cpp
+++ b/plugins/StopSpamMod/src/options.cpp
diff --git a/plugins/StopSpamMod/src/resource.h b/plugins/StopSpamMod/src/resource.h
index cf08fba600..cf08fba600 100755..100644
--- a/plugins/StopSpamMod/src/resource.h
+++ b/plugins/StopSpamMod/src/resource.h
diff --git a/plugins/StopSpamMod/src/stdafx.h b/plugins/StopSpamMod/src/stdafx.h
index 3a7e043ae4..3a7e043ae4 100755..100644
--- a/plugins/StopSpamMod/src/stdafx.h
+++ b/plugins/StopSpamMod/src/stdafx.h
diff --git a/plugins/StopSpamMod/src/stopspam.cpp b/plugins/StopSpamMod/src/stopspam.cpp
index a01b18ff76..a01b18ff76 100755..100644
--- a/plugins/StopSpamMod/src/stopspam.cpp
+++ b/plugins/StopSpamMod/src/stopspam.cpp
diff --git a/plugins/StopSpamMod/src/stopspam.h b/plugins/StopSpamMod/src/stopspam.h
index 6285433209..6285433209 100755..100644
--- a/plugins/StopSpamMod/src/stopspam.h
+++ b/plugins/StopSpamMod/src/stopspam.h
diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp
index c051761ad6..c051761ad6 100755..100644
--- a/plugins/StopSpamMod/src/utilities.cpp
+++ b/plugins/StopSpamMod/src/utilities.cpp
diff --git a/plugins/StopSpamMod/src/utilities.h b/plugins/StopSpamMod/src/utilities.h
index 5b0d724408..5b0d724408 100755..100644
--- a/plugins/StopSpamMod/src/utilities.h
+++ b/plugins/StopSpamMod/src/utilities.h
diff --git a/plugins/StopSpamMod/src/version.h b/plugins/StopSpamMod/src/version.h
index 5a3b3191ee..5a3b3191ee 100755..100644
--- a/plugins/StopSpamMod/src/version.h
+++ b/plugins/StopSpamMod/src/version.h
diff --git a/plugins/Watrack_MPD/res/watrack_mpd.rc b/plugins/Watrack_MPD/res/watrack_mpd.rc
index 711eec517f..711eec517f 100755..100644
--- a/plugins/Watrack_MPD/res/watrack_mpd.rc
+++ b/plugins/Watrack_MPD/res/watrack_mpd.rc
diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp
index 89d7b28d81..89d7b28d81 100755..100644
--- a/plugins/Watrack_MPD/src/init.cpp
+++ b/plugins/Watrack_MPD/src/init.cpp
diff --git a/plugins/Watrack_MPD/src/main.cpp b/plugins/Watrack_MPD/src/main.cpp
index fb5d454ab5..fb5d454ab5 100755..100644
--- a/plugins/Watrack_MPD/src/main.cpp
+++ b/plugins/Watrack_MPD/src/main.cpp
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp
index a3d95ffec3..a3d95ffec3 100755..100644
--- a/plugins/Watrack_MPD/src/options.cpp
+++ b/plugins/Watrack_MPD/src/options.cpp
diff --git a/plugins/Watrack_MPD/src/resource.h b/plugins/Watrack_MPD/src/resource.h
index 4999f6c88e..4999f6c88e 100755..100644
--- a/plugins/Watrack_MPD/src/resource.h
+++ b/plugins/Watrack_MPD/src/resource.h
diff --git a/plugins/Watrack_MPD/src/stdafx.h b/plugins/Watrack_MPD/src/stdafx.h
index 2aa2688d31..2aa2688d31 100755..100644
--- a/plugins/Watrack_MPD/src/stdafx.h
+++ b/plugins/Watrack_MPD/src/stdafx.h
diff --git a/plugins/Watrack_MPD/watrack_mpd.vcxproj b/plugins/Watrack_MPD/watrack_mpd.vcxproj
index 795dc542cf..795dc542cf 100755..100644
--- a/plugins/Watrack_MPD/watrack_mpd.vcxproj
+++ b/plugins/Watrack_MPD/watrack_mpd.vcxproj
diff --git a/plugins/Watrack_MPD/watrack_mpd.vcxproj.filters b/plugins/Watrack_MPD/watrack_mpd.vcxproj.filters
index eecd762927..eecd762927 100755..100644
--- a/plugins/Watrack_MPD/watrack_mpd.vcxproj.filters
+++ b/plugins/Watrack_MPD/watrack_mpd.vcxproj.filters