Merge branch 'ruler-view'
authorRobert Sesek <rsesek@bluestatic.org>
Sat, 26 Feb 2011 19:10:51 +0000 (14:10 -0500)
committerRobert Sesek <rsesek@bluestatic.org>
Sat, 26 Feb 2011 19:10:51 +0000 (14:10 -0500)
commite9c3ddce94f86c522d4a75a35d195ed83e084563
treed1c11616e0a6e333d9ef77bd62879b174e7d388b
parent9ba529b496a278e65043985503891ba42a209a5f
parent93e65f373f75cdaa80698d33e9146f70bbf1a159
Merge branch 'ruler-view'

Conflicts:
CHANGES
Source/BSLineNumberView.m
Source/BSSourceView.h
Source/BSSourceView.mm
Source/BSSourceViewTextView.m
CHANGES
MacGDBp.xcodeproj/project.pbxproj
Source/BSSourceView.h
Source/BSSourceView.mm
Source/BreakpointController.m
Source/BreakpointManager.m
Source/DebuggerController.m