Merge branch 'next'
commitad8c8702a7e45d6ac3872c150dd6af4ac34e7de8
authorShawn O. Pearce <spearce@spearce.org>
Thu, 27 Aug 2009 01:24:08 +0000 (26 18:24 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 27 Aug 2009 01:24:08 +0000 (26 18:24 -0700)
tree80e73bcf4c3e377a0b4d739b5666a75c5842444b
parente97eca6dbdb6d140f1ba47bcf6b67d9642100a3b
parent12cba8fb047eb5099c0a222390c561f5eb2a8700
Merge branch 'next'

* next:
  Bug 284537 NPE when double-clicking for diff in commit dialog
  Fix shortcut conflict in CommitDialog