author | pavelpa <pavelpa@localhost> | |
Thu, 28 Jan 2010 14:59:37 +0000 (14:59 +0000) | ||
committer | pavelpa <pavelpa@localhost> | |
Thu, 28 Jan 2010 14:59:37 +0000 (14:59 +0000) | ||
commit | 83020cddd8269fd206a9875549a5bcd1b8cf9360 | |
tree | 20012d94efcdedf9c13a3cae010e8d63bb875f9c | tree | snapshot |
parent | 872aeaa10875e45f50a9973cad7b17d9f85f83aa | commit | diff |
src/gui/conflictsdialog.cpp | diff | blob | history | |
src/gui/conflictsdialog.h | diff | blob | history |