Merge branch 'rebasedlg-conflict-deleted-refresh' of https://code.google.com/r/ch3coo...
commit192311fabd80f9e7544e6cacf8148c873dbad3fb
authorSven Strickroth <email@cs-ware.de>
Sun, 11 Nov 2012 17:15:43 +0000 (11 18:15 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 11 Nov 2012 17:15:43 +0000 (11 18:15 +0100)
tree0ccf43ef83dbe6c23c5683baf587ca414a9fa16e
parentb69ced955f72b9276965f7cf119f0806031c5588
parent3f9c599f7adaf561367bf818ed2b2a34fe3095f2
Merge branch 'rebasedlg-conflict-deleted-refresh' of https://code.google.com/r/ch3cooli-tortoisegit1
src/Git/GitStatusListCtrl.cpp