Merge branch 'bug-157'
authorRobert Sesek <rsesek@bluestatic.org>
Sat, 16 May 2009 19:10:53 +0000 (15:10 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Sat, 16 May 2009 19:10:53 +0000 (15:10 -0400)
commit514e1d7c66b441f5d814c57f9dfe07cb1b2b21b3
tree8f5757ae4f4b9e3bbef811d80a000a7fc5bc64e1
parentbff881978091f3a08b372fee3a8ca7db75821ce3
parent57e7d89d0afad678d98c8e9c6609128719209735
Merge branch 'bug-157'

Conflicts:
Source/DebuggerController.m
Source/GDBpConnection.m
Source/DebuggerController.m
Source/GDBpConnection.h
Source/GDBpConnection.m