This is an automated email from the git hooks/post-receive script.
unknown user pushed a commit to branch linaro in repository dejagnu.
commit 31aa24d3683d7150cae7b7c61b4d21af06eabd44 Merge: c465c48 e7d7a3e Author: Rob Savoye rob@welcomehome.org Date: Thu Jul 30 13:25:20 2015 -0600
Merge branch 'master' into linaro
Conflicts: ChangeLog
ChangeLog | 10 +++++-- lib/remote.exp | 86 ++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 70 insertions(+), 26 deletions(-)
diff --cc ChangeLog index 9145142,0bdaeb9..62b5eff --- a/ChangeLog +++ b/ChangeLog @@@ -45,8 -46,7 +46,11 @@@ 2015-05-12 Steve Ellcey sellcey@imgtec.com
* baseboards/generic-sim.exp: Check $DEJAGNU_SIM_OPTION. - >>>>>>> master + ++2015-04-17 Rob Savoye rob.savoye@linaro.org ++ ++ * lib/libgloss.exp (find_g++): Look for xg++ before g++. + 2015-03-30 Ben Elliston bje@gnu.org
Revert the following change which causes breakage reported here: