[llvm-branch-commits] [cfe-branch] r105199 - /cfe/branches/Apple/whitney-IB/clang-merge-list.txt

[Daniel Dunbar]

Author: ddunbar
Date: Sun May 30 23:59:58 2010
New Revision: 105199

URL: http://llvm.org/viewvc/llvm-project?rev=105199&view=rev
Log:
Update Clang merge list.

Modified:
    cfe/branches/Apple/whitney-IB/clang-merge-list.txt

Modified: cfe/branches/Apple/whitney-IB/clang-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/clang-merge-list.txt?rev=105199&r1=105198&r2=105199&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Sun May 30 23:59:58 2010
@@ -143,3 +143,6 @@
 # <rdar://problem/8044135> [fuzz] Assertion failed: (Loc >= BufferStart && L<=oc  BufferEnd && "Location out of range for this buffer!")
 105181
 105182
+
+# <rdar://problem/8042673> #warning is no longer a separate 'type' of warning
+105188