OSDN Git Service

* cxx-pretty-print.c: Correct merge error.
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 21 May 2010 22:58:12 +0000 (22:58 +0000)
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 21 May 2010 22:58:12 +0000 (22:58 +0000)
commitc627001c253cefb4fbec1d0502a8710b6f746bbd
tree22edaa20ecfb1210767bafc20a6205015cf7f250
parentce084dfc1cd60d867d38dbed86a914d82fa908d1
* cxx-pretty-print.c: Correct merge error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159686 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/cp/ChangeLog
gcc/cp/cxx-pretty-print.c