---
- branch: MAIN
  date: Tue Sep 18 07:04:42 UTC 2012
  files:
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/configure
    pathrev: src/external/gpl3/gcc/dist/configure@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/configure.ac
    pathrev: src/external/gpl3/gcc/dist/configure.ac@1.3
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/gpl3/gcc/dist/gcc/ChangeLog
    pathrev: src/external/gpl3/gcc/dist/gcc/ChangeLog@1.5
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/builtins.c
    pathrev: src/external/gpl3/gcc/dist/gcc/builtins.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/cfgexpand.c
    pathrev: src/external/gpl3/gcc/dist/gcc/cfgexpand.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/expr.c
    pathrev: src/external/gpl3/gcc/dist/gcc/expr.c@1.3
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/external/gpl3/gcc/dist/gcc/config.gcc
    pathrev: src/external/gpl3/gcc/dist/gcc/config.gcc@1.13
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl3/gcc/dist/gcc/configure
    pathrev: src/external/gpl3/gcc/dist/gcc/configure@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/config/arm/arm.md
    pathrev: src/external/gpl3/gcc/dist/gcc/config/arm/arm.md@1.3
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h
    pathrev: src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
    pathrev: src/external/gpl3/gcc/dist/gcc/config/i386/i386.c@1.3
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
    pathrev: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl3/gcc/dist/gcc/config/sh/sh.c
    pathrev: src/external/gpl3/gcc/dist/gcc/config/sh/sh.c@1.3
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl3/gcc/dist/gcc/testsuite/gcc.c-torture/execute/960321-1.x
    pathrev: src/external/gpl3/gcc/dist/gcc/testsuite/gcc.c-torture/execute/960321-1.x@0
    type: deleted
  id: 20120918T070442Z.851f1114cc2f30894aa88dce8e5bd8f0e91e22d5
  log: "Resolve conflicts.\n"
  module: src
  subject: 'CVS commit: src/external/gpl3/gcc/dist'
  unixtime: '1347951882'
  user: skrll