Merge branch 'marek'

diff --git a/.gitattributes b/.gitattributes
index 517c538d8c0854a00c8f2a5512ea50abc4563839..9f803813ed27451d773651c9ff76689009646408 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,11 @@
-*.c    crlf
-*.h    crlf
-*.cs   crlf
-*.sh   crlf
+#*.c   crlf
+#*.h   crlf
+#*.cs  crlf
+#*.sh  crlf
 
-ChangeLog      crlf
-*akefile*      crlf
-*.sources      crlf
+#ChangeLog     crlf
+#*akefile*     crlf
+#*.sources     crlf
 
 # don't do anything to line-endings.  Let CRLFs go into the repo
 *.bat          -crlf

diff --git a/docs/.gitignore b/docs/.gitignore
index 04ae490d56194d94de50269efe5e559636dbe86f..1be487d448de63b638063a41f4549e0736e604cc 100644 (file)
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -8,3 +8,4 @@
 /mono-file-formats.zip
 /mono-tools.tree
 /mono-tools.zip
+/AgilityPack.dll*

diff --git a/mcs/.gitignore b/mcs/.gitignore
index 3c2e5538be987ee234d53eb6962fe6e3530e2460..22da863639c07db8cde3d9cbe94c65b01d362ad3 100644 (file)
--- a/mcs/.gitignore
+++ b/mcs/.gitignore
@@ -1,6 +1,14 @@
 *.mdb
 *.exe
+*.dll
+*_test_*.dll.config
+*_test_*.xml
 *.o
+TestResult-*.log
+TestResult-*.xml
+errors/?mcs.log
+errors/dummy.xml
+tests/?mcs.log
 tests/gtest-*.dll
 tests/test-*.dll
 tests/xml-*.xml
@@ -8,11 +16,7 @@ tests/test-*.netmodule
 tests/gxml-*.xml
 tests/test-*.xml
 tests/data.xml
-tests/gmcs.log
-System_test_net_2_0.dll
-System_test_net_2_0.dll.config
-TestResult-net_2_0.log
-TestResult-net_2_0.xml
+class/Mono.Data.Sqlite/test.db
 class/Mono.CSharp/Mono.CSharp.dll.sources
 class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs
 class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs

diff --git a/mcs/errors/.gitattributes b/mcs/errors/.gitattributes
index e027e6d507fd70b2889639032901f8ea500304b9..cbea4b091712544f3fbd0242210216e58aef6949 100644 (file)
--- a/mcs/errors/.gitattributes
+++ b/mcs/errors/.gitattributes
@@ -72,3 +72,10 @@
 /gcs1961-37.cs -crlf
 /gcs1961-9.cs -crlf
 /gcs1961.cs -crlf
+/cs0122-32.cs -crlf
+/cs0143.cs -crlf
+/cs1540-12.cs -crlf
+/cs1739-3.cs -crlf
+/cs1746.cs -crlf
+/gcs0307-5.cs -crlf
+/gcs1579.cs -crlf

diff --git a/mcs/tests/.gitattributes b/mcs/tests/.gitattributes
index 95b037b082fe6871c7a7456d363e69d568113a4c..b823b23c280b7bbe692ba06062da7259e70d69c9 100644 (file)
--- a/mcs/tests/.gitattributes
+++ b/mcs/tests/.gitattributes
@@ -42,3 +42,7 @@
 /test-xml-037-ref.xml -crlf
 /test-xml-038-ref.xml -crlf
 /test-xml-050-ref.xml -crlf
+/gtest-522.cs -crlf
+/gtest-525.cs -crlf
+/gtest-linq-24.cs -crlf
+/test-788.cs -crlf