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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 17 18:04:34 2011
New Revision: 123698

URL: http://llvm.org/viewvc/llvm-project?rev=123698&view=rev
Log:
Update LLVM and Clang merge lists.

Modified:
    cfe/branches/Apple/whitney-IB/clang-merge-list.txt
    cfe/branches/Apple/whitney-IB/llvm-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=123698&r1=123697&r2=123698&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Mon Jan 17 18:04:34 2011
@@ -545,3 +545,6 @@
 
 # <rdar://problem/8854933> short enums do not work with llvm
 123510
+
+# <rdar://problem/8845786> Remove -fobjc-default-synthesize-properties flag
+Custom: 123697

Modified: cfe/branches/Apple/whitney-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/llvm-merge-list.txt?rev=123698&r1=123697&r2=123698&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Mon Jan 17 18:04:34 2011
@@ -178,6 +178,7 @@
 # <rdar://problem/8813415> [regression] [nt] External/SPEC/CINT2000/164_gzip/164_gzip.exec miscompile
 122771
 122772
+Custom: 123696
 
 # <rdar://problem/8792542> misaligned branch destination
 120324