Changed EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows...

diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
index 7ced6bb..c66c4a3 100644 (file)
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -1,229 +1,229 @@
-
-People who have contributed to WinMerge
----------------------------------------
-
-Original developer, project admin:
-* Dean Grimm <grimmdp@yahoo.com>
-
-Project lead:
-* Christian List <list1974@hotmail.com>
-
-Developers:
-* Denis Bradford <denisbradford@users.sourceforge.net>
-* Tim Gerundt <tim@gerundt.de>
-* Marcel Gosselin <marcelgosselin@users.sourceforge.net>
-* Gal Hammer <galh@users.sourceforge.net>
-* Takashi Sawanaka <sdottaka@users.sourceforge.net>
-* Alexander Skinner (Graphic Design) <neonapple@users.sourceforge.net>
-* Jochen Tucht <jtuc@users.sourceforge.net>
-* Kimmo Varis <kimmov@winmerge.org>
-
-Inactive/past developers:
-* Laurent Ganier
-* Dennis Limm
-* Chris Mumford
-* Perry Rapp
-* Christian "Seier" Blackburn (Installer)
-
-Localization:
-* Basque:
-  Xabier Aramendi <Azpidatziak@gmail.com>  
-
-* Bulgarian:
-  Sld <sld|mail.bg>
-  tigertron <ivg_18@yahoo.com>
-
-* Catalan:
-  Jordi Vilar <jvilar@users.sourceforge.net>
-
-* Simplified Chinese:
-  Liaobin <liaobin@jite. net>
-
-* Traditional Chinese:
-  Koko <kokokoko@giga.net.tw>
-  Calvin Lin <ylin77 at gmail.com>
-
-* Croatian:
-  Hasan Osmanagiæ <hasan.osmanagic@public.carnet.hr>
-
-* Czech:
-  Jiri Tax <jt@taxoft.cz>
-  Jan Hryz <janhryz@users.sourceforge.net>
-
-* Danish:
-  Rolf Egmose
-  Christian List <list1974@hotmail.com>
-
-* Dutch:
-  Michel Coene
-  Thomas De Rocker <thomasderocker@yahoo.com>
-  Ronald Schaap <ronald@schaap.demon.nl>
-
-* Finnish:
-  Veikko Muurikainen <veikko.muurikainen at kolumbus.fi>
-
-* French:
-  Jean-F Jolin <jean-f-j@users.sourceforge.net>
-  Gil Andre <gil_andre@compuserve.com>
-  Laurent Ganier <ccganier@club-internet.fr>
-  Dominique Saussereau <redguff@users.sourceforge.net>
-  Matthieu Pupat
-
-* Galician:
-  Medulio
-
-* German:
-  Tim Gerundt <tim@gerundt.de>
-  Winfried Peter <winfried.peter@omicron.at>
-  Joerg Schneider <tonda@users.sourceforge.net>
-
-* Greek:
-  Polyvios J. Simopoulos <polyvios.j.simopoulos@gmail.com>
-
-* Hungarian:
-  Márton Balázs <documan@users.sourceforge.net>
-  Mihalicza József <jmihalicza@gmail.com>
-
-* Italian:
-  Andrea Decorte <deco1985@hotmail.com>
-  Antonio Angelo <antonio.angelo@gmail.com>
-  Michele Merega <michele.merega@ifminfomaster.com>
-
-* Korean:
-  Sukjoon <bbcool@gmail.com>
-  Lee Jae-Hong <pyrasis@users.sourceforge.net>
-  Sushizang <sushizang@empal.com>
-  sheppaul <sheppaul at gmail.com>
-
-* Lithuanian:
-  Dalius Guzauskas (aka Tichij) <tichij AT mail DOT com>
-
-* Norwegian:
-  Hans Fredrik Nordhaug <hansfn@users.sourceforge.net>
-
-* Persian:
-  Abolfazl Rostamzadeh <a.rostamzadeh at gmail.com>
-
-* Polish:
-  M.T <mtrz@users.sourceforge.net>
-  Skiff <skiffatsf@users.sourceforge.net>
-  Pawel Wawrzysko <traduc@kki.pl>
-
-* Portuguese (Brazilian):
-  Wender Firmino <wender@pta.com.br>
-  Felipe Periard Lopes <felipefpl@ig.com.br>
-
-* Portuguese (Portugal):
-  Nelson Simão
-  Lippe35
-
-* Romanian:
-  Cristian Arghiroiu <cristi.arghiroiu@gmail.com>
-
-* Russian:
-  Dmitriy S. Aleshkowskiy <wwarlock@mail.ru>
-  Timon34
-
-* Serbian:
-  Ozzii <ivanstar61@gmail.com>
-
-* Sinhala:
-  T G E Perera
-
-* Slovak:
-  Majvan <vancojur@decef.elf.stuba.sk>
-  Ivan Masár <helix84@centrum.sk>
-
-* Slovenian:
-  Iztok Osredkar <iztok.osredkar@institut-oko.si>
-  Filip Komar <filip.komar@gmail.com>
-
-* Spanish:
-  Mario Angel <marioangel70@gmail.com>
-  Jesús M. Delgado 'MacK' <nncsoft@yahoo.com>
-  Dean Grimm <grimmdp@yahoo.com>
-
-* Swedish:
-  Hans Eriksson <hans.ericson@bredband.net>
-  Göran Håkansson <goran.x.hakansson@telia.com>
-  pgert <pgert at yahoo.se>
-
-* Turkish:
-  Afyonlu <afyonlu@users.sourceforge.net>
-  Ozkan UNVER <turquaz37915@users.sourceforge.net>
-  Kaya Zeren <kaya.zeren at zeron.net>
-
-* Ukranian
-  Vitaliy Stopchans'kyy <stopcha@gmail.com>
-  Warrior <warr11r@rambler.ru>
-
-
-Other Contributors (code, ideas, testing..):
-* James Abbatiello <abbeyj@users.sourceforge.net>
-* Andre Arpin
-* Steve Beaudoin
-* bulklodd <bulklodd@users.sourceforge.net>
-* Adam Carrivick
-* Hern Chen
-* Jeremy Dewey
-* Jim Fougeron
-* Marvin Gouw
-* Robert Grange
-* black hero <black-hero@users.sourceforge.net>
-* Jan Hryz
-* jwdevel
-* Ed_K
-* Alberto Kalb
-* Joe Kidd <cassiusdrow@sourceforge.net>
-* Robert Knienider
-* Ferenc Kubatovics
-* René Leonhardt
-* Vladimir Lukianov
-* LynX <devlynx@users.sourceforge.net>
-* David Maisonave
-* Dmitry Maslov
-* Denis Matiukha
-* Matthias Mayer
-* Harry Mckame
-* Oliver Mellet
-* Andreas Morsing
-* Ryan Mott
-* Tim Musschoot
-* Marco De Paoli
-* Paul <pavel_kv@users.sourceforge.net>
-* Chris Paulse <christo_p@users.sourceforge.net>
-* Dan Pidcock
-* Vincent Osele
-* Scott Rasmussen
-* Michael Richter
-* Markus Rollmann
-* saitaman <saitaman@users.sourceforge.net>
-* Philippe Verdy
-* Vikrant
-* Gilbert Wellisch
-* Paul Welter
-* Lars Wittenburg
-* Etienne Faisant
-* Bill Gord
-* H.Saido
-
-
-WinMerge includes code from:
-* Jared Breland <jbreland@legroom.net> (Installer's modpath script)
-* Brent Corkum (BCMenu)
-* Paul DiLascia (CStaticLink) 
-* Michael Dunn (CShellFileOp)
-* Francis Irving (original conflict file parser)
-* Michael P. Mehl (CMessageBoxDialog)
-* Cristi Posea (CSizingControlBar)
-* Ferdinand Prantl (CrystalEditor syntax rules)
-* Keith Rule (CMemDC - memory DC)
-* Paul Senzee (String formatting)
-* Henry Spencer (CRegExp)
-* Andrei Stcherbatchenko (CrystalEditor)
-
-*** NOTE ***
-If your name is missing please email us at:
-winmerge-support@lists.sourceforge.net
-
-Thanks!
+\r
+People who have contributed to WinMerge\r
+---------------------------------------\r
+\r
+Original developer, project admin:\r
+* Dean Grimm <grimmdp@yahoo.com>\r
+\r
+Project lead:\r
+* Christian List <list1974@hotmail.com>\r
+\r
+Developers:\r
+* Denis Bradford <denisbradford@users.sourceforge.net>\r
+* Tim Gerundt <tim@gerundt.de>\r
+* Marcel Gosselin <marcelgosselin@users.sourceforge.net>\r
+* Gal Hammer <galh@users.sourceforge.net>\r
+* Takashi Sawanaka <sdottaka@users.sourceforge.net>\r
+* Alexander Skinner (Graphic Design) <neonapple@users.sourceforge.net>\r
+* Jochen Tucht <jtuc@users.sourceforge.net>\r
+* Kimmo Varis <kimmov@winmerge.org>\r
+\r
+Inactive/past developers:\r
+* Laurent Ganier\r
+* Dennis Limm\r
+* Chris Mumford\r
+* Perry Rapp\r
+* Christian "Seier" Blackburn (Installer)\r
+\r
+Localization:\r
+* Basque:\r
+  Xabier Aramendi <Azpidatziak@gmail.com>  \r
+\r
+* Bulgarian:\r
+  Sld <sld|mail.bg>\r
+  tigertron <ivg_18@yahoo.com>\r
+\r
+* Catalan:\r
+  Jordi Vilar <jvilar@users.sourceforge.net>\r
+\r
+* Simplified Chinese:\r
+  Liaobin <liaobin@jite. net>\r
+\r
+* Traditional Chinese:\r
+  Koko <kokokoko@giga.net.tw>\r
+  Calvin Lin <ylin77 at gmail.com>\r
+\r
+* Croatian:\r
+  Hasan Osmanagiæ <hasan.osmanagic@public.carnet.hr>\r
+\r
+* Czech:\r
+  Jiri Tax <jt@taxoft.cz>\r
+  Jan Hryz <janhryz@users.sourceforge.net>\r
+\r
+* Danish:\r
+  Rolf Egmose\r
+  Christian List <list1974@hotmail.com>\r
+\r
+* Dutch:\r
+  Michel Coene\r
+  Thomas De Rocker <thomasderocker@yahoo.com>\r
+  Ronald Schaap <ronald@schaap.demon.nl>\r
+\r
+* Finnish:\r
+  Veikko Muurikainen <veikko.muurikainen at kolumbus.fi>\r
+\r
+* French:\r
+  Jean-F Jolin <jean-f-j@users.sourceforge.net>\r
+  Gil Andre <gil_andre@compuserve.com>\r
+  Laurent Ganier <ccganier@club-internet.fr>\r
+  Dominique Saussereau <redguff@users.sourceforge.net>\r
+  Matthieu Pupat\r
+\r
+* Galician:\r
+  Medulio\r
+\r
+* German:\r
+  Tim Gerundt <tim@gerundt.de>\r
+  Winfried Peter <winfried.peter@omicron.at>\r
+  Joerg Schneider <tonda@users.sourceforge.net>\r
+\r
+* Greek:\r
+  Polyvios J. Simopoulos <polyvios.j.simopoulos@gmail.com>\r
+\r
+* Hungarian:\r
+  Márton Balázs <documan@users.sourceforge.net>\r
+  Mihalicza József <jmihalicza@gmail.com>\r
+\r
+* Italian:\r
+  Andrea Decorte <deco1985@hotmail.com>\r
+  Antonio Angelo <antonio.angelo@gmail.com>\r
+  Michele Merega <michele.merega@ifminfomaster.com>\r
+\r
+* Korean:\r
+  Sukjoon <bbcool@gmail.com>\r
+  Lee Jae-Hong <pyrasis@users.sourceforge.net>\r
+  Sushizang <sushizang@empal.com>\r
+  sheppaul <sheppaul at gmail.com>\r
+\r
+* Lithuanian:\r
+  Dalius Guzauskas (aka Tichij) <tichij AT mail DOT com>\r
+\r
+* Norwegian:\r
+  Hans Fredrik Nordhaug <hansfn@users.sourceforge.net>\r
+\r
+* Persian:\r
+  Abolfazl Rostamzadeh <a.rostamzadeh at gmail.com>\r
+\r
+* Polish:\r
+  M.T <mtrz@users.sourceforge.net>\r
+  Skiff <skiffatsf@users.sourceforge.net>\r
+  Pawel Wawrzysko <traduc@kki.pl>\r
+\r
+* Portuguese (Brazilian):\r
+  Wender Firmino <wender@pta.com.br>\r
+  Felipe Periard Lopes <felipefpl@ig.com.br>\r
+\r
+* Portuguese (Portugal):\r
+  Nelson Simão\r
+  Lippe35\r
+\r
+* Romanian:\r
+  Cristian Arghiroiu <cristi.arghiroiu@gmail.com>\r
+\r
+* Russian:\r
+  Dmitriy S. Aleshkowskiy <wwarlock@mail.ru>\r
+  Timon34\r
+\r
+* Serbian:\r
+  Ozzii <ivanstar61@gmail.com>\r
+\r
+* Sinhala:\r
+  T G E Perera\r
+\r
+* Slovak:\r
+  Majvan <vancojur@decef.elf.stuba.sk>\r
+  Ivan Masár <helix84@centrum.sk>\r
+\r
+* Slovenian:\r
+  Iztok Osredkar <iztok.osredkar@institut-oko.si>\r
+  Filip Komar <filip.komar@gmail.com>\r
+\r
+* Spanish:\r
+  Mario Angel <marioangel70@gmail.com>\r
+  Jesús M. Delgado 'MacK' <nncsoft@yahoo.com>\r
+  Dean Grimm <grimmdp@yahoo.com>\r
+\r
+* Swedish:\r
+  Hans Eriksson <hans.ericson@bredband.net>\r
+  Göran Håkansson <goran.x.hakansson@telia.com>\r
+  pgert <pgert at yahoo.se>\r
+\r
+* Turkish:\r
+  Afyonlu <afyonlu@users.sourceforge.net>\r
+  Ozkan UNVER <turquaz37915@users.sourceforge.net>\r
+  Kaya Zeren <kaya.zeren at zeron.net>\r
+\r
+* Ukranian\r
+  Vitaliy Stopchans'kyy <stopcha@gmail.com>\r
+  Warrior <warr11r@rambler.ru>\r
+\r
+\r
+Other Contributors (code, ideas, testing..):\r
+* James Abbatiello <abbeyj@users.sourceforge.net>\r
+* Andre Arpin\r
+* Steve Beaudoin\r
+* bulklodd <bulklodd@users.sourceforge.net>\r
+* Adam Carrivick\r
+* Hern Chen\r
+* Jeremy Dewey\r
+* Jim Fougeron\r
+* Marvin Gouw\r
+* Robert Grange\r
+* black hero <black-hero@users.sourceforge.net>\r
+* Jan Hryz\r
+* jwdevel\r
+* Ed_K\r
+* Alberto Kalb\r
+* Joe Kidd <cassiusdrow@sourceforge.net>\r
+* Robert Knienider\r
+* Ferenc Kubatovics\r
+* René Leonhardt\r
+* Vladimir Lukianov\r
+* LynX <devlynx@users.sourceforge.net>\r
+* David Maisonave\r
+* Dmitry Maslov\r
+* Denis Matiukha\r
+* Matthias Mayer\r
+* Harry Mckame\r
+* Oliver Mellet\r
+* Andreas Morsing\r
+* Ryan Mott\r
+* Tim Musschoot\r
+* Marco De Paoli\r
+* Paul <pavel_kv@users.sourceforge.net>\r
+* Chris Paulse <christo_p@users.sourceforge.net>\r
+* Dan Pidcock\r
+* Vincent Osele\r
+* Scott Rasmussen\r
+* Michael Richter\r
+* Markus Rollmann\r
+* saitaman <saitaman@users.sourceforge.net>\r
+* Philippe Verdy\r
+* Vikrant\r
+* Gilbert Wellisch\r
+* Paul Welter\r
+* Lars Wittenburg\r
+* Etienne Faisant\r
+* Bill Gord\r
+* H.Saido\r
+\r
+\r
+WinMerge includes code from:\r
+* Jared Breland <jbreland@legroom.net> (Installer's modpath script)\r
+* Brent Corkum (BCMenu)\r
+* Paul DiLascia (CStaticLink) \r
+* Michael Dunn (CShellFileOp)\r
+* Francis Irving (original conflict file parser)\r
+* Michael P. Mehl (CMessageBoxDialog)\r
+* Cristi Posea (CSizingControlBar)\r
+* Ferdinand Prantl (CrystalEditor syntax rules)\r
+* Keith Rule (CMemDC - memory DC)\r
+* Paul Senzee (String formatting)\r
+* Henry Spencer (CRegExp)\r
+* Andrei Stcherbatchenko (CrystalEditor)\r
+\r
+*** NOTE ***\r
+If your name is missing please email us at:\r
+winmerge-support@lists.sourceforge.net\r
+\r
+Thanks!\r