gdb: Temporarily revert modifications for branch merge
authorJohn Marino <draco@marino.st>
Fri, 11 May 2012 06:03:31 +0000 (08:03 +0200)
committerJohn Marino <draco@marino.st>
Fri, 11 May 2012 10:38:49 +0000 (12:38 +0200)
commit6938d9ab5938f24b49d1757b7426edfe267ce063
treeed7efb446b046ed832d2ee55e7c71687ec86691b
parent52f9ffcfb1a0e8fc03e584cd8ef8f66b7f71f884
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
contrib/gdb-7/gdb/defs.h
contrib/gdb-7/gdb/inferior.c
contrib/gdb-7/gdb/inferior.h
contrib/gdb-7/gdb/mi/mi-main.c