-
Raphael Kubo da Costa authored
Experimentally merge the stable (KDE/4.8) branch into master with `git merge --log --edit -s recursive -Xours'. Some translation commits ended up being merged, but tsdgeos said it's OK as they will be automatically reverted by scripty. * KDE/4.8: clizip: Define PasswordPromptPattern. cliinterface: A password prompt can also be shown when extracting. queries: Consider an empty password as a request cancellation. cliinterface: Correctly set QIODevice::Text. cli7zip: Completely remove RootNodeSwitch. SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file) fix linking order which fixes a linker issue on windows SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file) Add missing add_definition() calls. SVN_SILENT made messages (.desktop file) Save and restore the size of the internal viewer window. SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)
83365ca4