Merge remote-tracking branch 'origin/1.8'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 27 Apr 2015 10:20:11 +0000 (12:20 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 27 Apr 2015 10:20:11 +0000 (12:20 +0200)
commitddfb7f3b7a8d92d78a4045579613a4a25fbbe127
tree5c05be287ec3a3bf6c978090ddb2d153c51f92b0
parent68bf22f469d3649a5bd93e4ec95621caf56c8e6f
parent520e2eb3927ede91d442d00922f0314ca2705c83
Merge remote-tracking branch 'origin/1.8'
doc/installing.rst
src/gui/folder.cpp
src/gui/sharedialog.h
src/libsync/propagatedownload.cpp