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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Nov 11 12:42:53 2010
New Revision: 118808

URL: http://llvm.org/viewvc/llvm-project?rev=118808&view=rev
Log:
Update 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=118808&r1=118807&r2=118808&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Thu Nov 11 12:42:53 2010
@@ -161,3 +161,6 @@
 
 # Patch from dchisnall (for clean merges).
 118170
+
+# <rdar://problem/8621295> disable Clang 2.0 ObjC extensions (-fnon-fragile-abi2)
+118786