2011-06-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
commit67f8f44952324f3eb6ae564a696b8ee04efccccf
authorJerry DeLisle <jvdelisle@gcc.gnu.org>
Sun, 5 Jun 2011 17:42:55 +0000 (5 17:42 +0000)
committerJerry DeLisle <jvdelisle@gcc.gnu.org>
Sun, 5 Jun 2011 17:42:55 +0000 (5 17:42 +0000)
treeca7498f76c8ecfb88405f61c4a8ce7bb32761ea4
parent419b55d0f9076bfa47c93b5899a83e953cee2d96
2011-06-05  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

Merge trunk into branch, part one.

[[Split portion of a mixed commit.]]

From-SVN: r174658.2
33 files changed:
gcc/go/gofrontend/expressions.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/expressions.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/expressions.cc.working [new file with mode: 0644]
gcc/go/gofrontend/go.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/go.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/go.cc.working [new file with mode: 0644]
gcc/go/gofrontend/gogo-tree.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/gogo-tree.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/gogo-tree.cc.working [new file with mode: 0644]
gcc/go/gofrontend/gogo.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/gogo.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/gogo.cc.working [new file with mode: 0644]
gcc/go/gofrontend/gogo.h.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/gogo.h.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/gogo.h.working [new file with mode: 0644]
gcc/go/gofrontend/parse.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/parse.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/parse.cc.working [new file with mode: 0644]
gcc/go/gofrontend/parse.h.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/parse.h.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/parse.h.working [new file with mode: 0644]
gcc/go/gofrontend/statements.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/statements.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/statements.cc.working [new file with mode: 0644]
gcc/go/gofrontend/statements.h.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/statements.h.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/statements.h.working [new file with mode: 0644]
gcc/go/gofrontend/types.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/types.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/types.cc.working [new file with mode: 0644]
gcc/go/gofrontend/unsafe.cc.merge-left.r167407 [new file with mode: 0644]
gcc/go/gofrontend/unsafe.cc.merge-right.r172891 [new file with mode: 0644]
gcc/go/gofrontend/unsafe.cc.working [new file with mode: 0644]