Merge branch 'menu-validation'
authorRobert Sesek <rsesek@bluestatic.org>
Sun, 13 Jul 2008 23:45:10 +0000 (19:45 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Sun, 13 Jul 2008 23:45:10 +0000 (19:45 -0400)
commit654ccaf4cb2307d8d38f36adf401884a030873d8
tree598f2f8708381a41f06a0ae973380149ac03e9cf
parentcc56d3628f5429a9c2c97eeeee8afcf0800e3678
parentc2854519c7b56e31a4e3cda90607dfe27f732b68
Merge branch 'menu-validation'

Conflicts:

English.lproj/MainMenu.xib: Took HEAD XIB and copied branch XIB's Debugger menu manually
English.lproj/MainMenu.xib