| commit | 79d822528c732a292ec9974a2ffacdb0dc6db79f | |
| author | Nicola Pero <nicola.pero@meta-innovation.com> | |
| Wed, 23 Feb 2011 10:57:59 +0000 (23 10:57 +0000) | ||
| committer | Nicola Pero <nicola@gcc.gnu.org> | |
| Wed, 23 Feb 2011 10:57:59 +0000 (23 10:57 +0000) | ||
| tree | 00d37a8caa57c4cada7e20a68cfc6490ccfee7c6 | treesnapshot (tar.gz zip) |
| parent | 21e1e594a965e3742aca387b0f76e4bcbb19c64c | commitdiff |
Removed conflict in usage of TYPE_LANG_SLOT_0 between Objective-C and C
From-SVN: r170436
From-SVN: r170436