| commit | fa784da5b9039ead42323bfe9ae6d33ab3c5c6b3 | [log] [tgz] |
|---|---|---|
| author | Shih-wei Liao <sliao@google.com> | Tue Apr 24 11:44:33 2012 -0700 |
| committer | Shih-wei Liao <sliao@google.com> | Tue Apr 24 11:44:33 2012 -0700 |
| tree | 5fbb2b2ab3aafc2a3a3af0bd3269068bb155188f | |
| parent | 2d4476d7733465f6c446432e654d12047c90b604 [diff] | |
| parent | ab8f4da25d3ac3275b0ae62c19350a9a5362c790 [diff] |
Merge with CLANG upstream r155088. Conflicts: lib/Basic/Targets.cpp Change-Id: Id80f069ae25e623967b705e9fa11cfd94dd2461c