--- Merging r17924 into '.':

A    packages/fcl-extra/examples/daemon.txt
D    packages/fcl-base/examples/daemon.txt

# revisions: 17924
------------------------------------------------------------------------
r17924 | joost | 2011-07-03 22:59:14 +0200 (Sun, 03 Jul 2011) | 1 line
Changed paths:
   D /trunk/packages/fcl-base/examples/daemon.txt
   A /trunk/packages/fcl-extra/examples/daemon.txt (from /trunk/packages/fcl-base/examples/daemon.txt:17918)

 * Moved daemon.txt to fcl-extra, where daemon.pp is moved to
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17934 -

.gitattributes

@@ -1032,7 +1032,6 @@ packages/fcl-base/examples/base64decodingtestcase.pas svneol=native#text/plain
 packages/fcl-base/examples/cachetest.pp svneol=native#text/plain
 packages/fcl-base/examples/cfgtest.pp svneol=native#text/plain
 packages/fcl-base/examples/crittest.pp svneol=native#text/plain
-packages/fcl-base/examples/daemon.txt svneol=native#text/plain
 packages/fcl-base/examples/dbugsrv.pp svneol=native#text/plain
 packages/fcl-base/examples/debugtest.pp svneol=native#text/plain
 packages/fcl-base/examples/decodeascii85.pp svneol=native#text/plain
@@ -1374,6 +1373,7 @@ packages/fcl-extra/Makefile.fpc svneol=native#text/plain
 packages/fcl-extra/examples/Makefile svneol=native#text/plain
 packages/fcl-extra/examples/Makefile.fpc svneol=native#text/plain
 packages/fcl-extra/examples/daemon.pp svneol=native#text/plain
+packages/fcl-extra/examples/daemon.txt svneol=native#text/plain
 packages/fcl-extra/fpmake.pp svneol=native#text/pascal
 packages/fcl-extra/src/daemonapp.pp svneol=native#text/plain
 packages/fcl-extra/src/unix/daemonapp.inc svneol=native#text/plain