| commit | 450b86c0c9ff8307f5145ced621914600196c500 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Tue Mar 05 23:37:49 2013 -0800 |
| committer | Stephen Hines <srhines@google.com> | Tue Mar 05 23:37:49 2013 -0800 |
| tree | 812a3db3225ba34649380f0ac76654be927382a7 | |
| parent | f553c8d883b53f17586b26a0909baf7b821e6f27 [diff] | |
| parent | b58f810669d9c17bcc025b7560de01d162856f34 [diff] |
Merge commit 'b58f810669d9c17bcc025b7560de01d162856f34' into merge_20130226 Conflicts: include/clang/Basic/LangOptions.def lib/Sema/SemaDeclAttr.cpp Change-Id: Ia10b4d3b2c949a72d328cb58b113f90237d4a5d5