Activity: Set a message for conflicts. #2792
authorChristian Kamm <kamm@incasoftware.de>
Thu, 12 Mar 2015 08:32:44 +0000 (09:32 +0100)
committerChristian Kamm <kamm@incasoftware.de>
Thu, 12 Mar 2015 09:00:45 +0000 (10:00 +0100)
commit3992fba168df04614077504039a10ece4c6d60e9
treebaa4c360943a161c7a085a3e8a9a2c0b03ddeb52
parent4601ac8b0e338f9b100dccd8eb34e224ed64196d
Activity: Set a message for conflicts. #2792

Also show size when conflicting files are downloaded.
src/gui/protocolwidget.cpp
src/libsync/progressdispatcher.cpp