git: gdb: Temporarily revert modifications for branch merge

John Marino marino at crater.dragonflybsd.org
Fri May 11 03:42:29 PDT 2012


commit 6938d9ab5938f24b49d1757b7426edfe267ce063
Author: John Marino <draco at marino.st>
Date:   Fri May 11 08:03:31 2012 +0200

    gdb: Temporarily revert modifications for branch merge
    
    These four files don't merge with the vendor branch cleanly, so
    the plan is to:
    1) revert
    2) merge vendor branch
    3) reapply update versions

Summary of changes:
 contrib/gdb-7/gdb/defs.h       |    5 -----
 contrib/gdb-7/gdb/inferior.c   |   33 ++++++++++++++++-----------------
 contrib/gdb-7/gdb/inferior.h   |    2 --
 contrib/gdb-7/gdb/mi/mi-main.c |   12 ++++++------
 4 files changed, 22 insertions(+), 30 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6938d9ab5938f24b49d1757b7426edfe267ce063


-- 
DragonFly BSD source repository





More information about the Commits mailing list