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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Dec  6 16:38:59 2010
New Revision: 121054

URL: http://llvm.org/viewvc/llvm-project?rev=121054&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=121054&r1=121053&r2=121054&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Mon Dec  6 16:38:59 2010
@@ -406,3 +406,6 @@
 
 # <rdar://problem/8722589> [regression] Silence warning about explicit conversion with incompatible Objective-C pointer types
 120744
+
+# <rdar://problem/8734046> allow dropping cv-qualifiers on conversion to id
+121047