diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2010-09-10 11:05:52 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2010-09-10 11:05:52 +0200 |
| commit | 2b74262bfcb6002f9cff86d0b6546967a32d96cf (patch) | |
| tree | 6b69e18e779664c9c9672400f9aaa2a9fc3b4ea2 /gcc/objc/objc-act.c | |
| parent | 5d44e5c8398ca39f0cfdc33ff1470d17132b2af3 (diff) | |
| download | gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.zip gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.tar.gz gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.tar.bz2 | |
* ChangeLog: Remove SVN conflict marks.
From-SVN: r164144
Diffstat (limited to 'gcc/objc/objc-act.c')
0 files changed, 0 insertions, 0 deletions