diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-14 05:58:37 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-26 10:26:18 +0200 |
| commit | a0ee1300c34d5e6293dbfa9c37913aa7aa377fff (patch) | |
| tree | f4cd4657e7b4ec62f0077ec34dac5b1bba43ecff /src/plugins/cpptools/cppdoxygen.cpp | |
| parent | e8469a2babd0553fe1343b91cd904e459d89a2be (diff) | |
| download | qt-creator-a0ee1300c34d5e6293dbfa9c37913aa7aa377fff.tar.gz | |
Git: List conflicted files on stash pop conflict
Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppdoxygen.cpp')
0 files changed, 0 insertions, 0 deletions