r171171 - in /branches/google/gcc-4_6: ./ gcc/C...

[dnovillo at gcc dot gnu dot org]

Author: dnovillo
Date: Fri Mar 18 21:34:40 2011
New Revision: 171171

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=171171
Log:

	Merge from google/main rev 171163.


Added:
    branches/google/gcc-4_6/libstdc++-v3/ChangeLog.google-main
      - copied unchanged from r171163, branches/google/main/libstdc++-v3/ChangeLog.google-main
    branches/google/gcc-4_6/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
      - copied unchanged from r171163, branches/google/main/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
    branches/google/gcc-4_6/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
      - copied unchanged from r171163, branches/google/main/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
Removed:
    branches/google/gcc-4_6/libstdc++-v3/testsuite/decimal/mixed-mode_neg.cc
Modified:
    branches/google/gcc-4_6/   (props changed)
    branches/google/gcc-4_6/gcc/ChangeLog.google-4_6
    branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/gcc-4_6/libjava/classpath/   (props changed)

Propchange: branches/google/gcc-4_6/
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/
            ('svnmerge-integrated' modified)

Propchange: branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/libjava/classpath/
            ('svn:mergeinfo' modified)