--- Merging r31358 into '.':

 U   rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31358 into '.':
 U   .
--- Merging r31361 into '.':
U    tests/webtbs/tw1255.pp
--- Recording mergeinfo for merge of r31361 into '.':
 G   .

# revisions: 31358,31361

git-svn-id: branches/fixes_3_0@33102 -

.gitattributes

@@ -8422,7 +8422,7 @@ rtl/inc/sstrings.inc svneol=native#text/plain
 rtl/inc/strings.pp svneol=native#text/plain
 rtl/inc/stringsi.inc svneol=native#text/plain
 rtl/inc/sysres.inc svneol=native#text/plain
-rtl/inc/system.fpd -text
+rtl/inc/system.fpd svneol=native#text/plain
 rtl/inc/system.inc svneol=native#text/plain
 rtl/inc/systemh.inc svneol=native#text/plain
 rtl/inc/text.inc svneol=native#text/plain

tests/webtbs/tw1255.pp

@@ -20,7 +20,11 @@ end;
 
 begin
 {$ifdef UNIX}
-  testff('/etc/host*');
+  {$ifdef haiku}
+    testff('/boot/system/lib/libroot.*');
+  {$else}
+    testff('/etc/host*');
+  {$endif}
 {$else}
   {$ifdef wince}
     testff('\windows\calc.*');