diff --git a/.gitattributes b/.gitattributes index 0e1c493e40..2d04e1bd0e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -456,7 +456,6 @@ components/trayicon/examples/frmtest.lrs svneol=native#text/plain components/trayicon/examples/frmtest.pas svneol=native#text/plain components/trayicon/examples/icon.ico -text svneol=unset#image/ico components/trayicon/examples/icon.xpm svneol=native#text/plain -components/trayicon/examples/magnifier.or -text components/trayicon/examples/magnifier.res -text components/trayicon/examples/wndtray.cfg svneol=native#text/plain components/trayicon/examples/wndtray.dof svneol=native#text/plain diff --git a/components/trayicon/examples/frmtest.pas b/components/trayicon/examples/frmtest.pas index 30ae8b73e7..6cc8b188b6 100644 --- a/components/trayicon/examples/frmtest.pas +++ b/components/trayicon/examples/frmtest.pas @@ -3,8 +3,8 @@ ***************************************************************************** * * - * This demonstration program is public domain, witch means no copyright, * - * but also no warranty! * + * This demonstration program is public domain, which means no copyright, * + * but also no warranty! * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * diff --git a/components/trayicon/examples/magnifier.or b/components/trayicon/examples/magnifier.or deleted file mode 100644 index 4b8d8b2c57..0000000000 Binary files a/components/trayicon/examples/magnifier.or and /dev/null differ diff --git a/components/trayicon/examples/wndtray.dpr b/components/trayicon/examples/wndtray.dpr index ba557d9cd5..a6f62d15fc 100644 --- a/components/trayicon/examples/wndtray.dpr +++ b/components/trayicon/examples/wndtray.dpr @@ -3,8 +3,8 @@ ***************************************************************************** * * - * This demonstration program is public domain, witch means no copyright, * - * but also no warranty! * + * This demonstration program is public domain, which means no copyright, * + * but also no warranty! * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of *