~rikmills/+git/krusader-upstream:kde4

Last commit made on 2016-03-28
Get this branch:
git clone -b kde4 https://git.launchpad.net/~rikmills/+git/krusader-upstream

Branch merges

Branch information

Name:
kde4
Repository:
lp:~rikmills/+git/krusader-upstream

Recent commits

389b153... by Davide Gianforte <email address hidden>

Fix for commit 615436d

This commit introduced a regression; when "Always sort dirs by name" is checked
the files are sorted in reverse.

11abe67... by Davide Gianforte <email address hidden>

FIXED : [ 290304 ] Don't change dirs sorting when a column sorting is descending

When "Always sort dirs by name" is checked, the dirs sorting is changed
if a column sorting is set to descending. This patch modify this behaviour;
directories will be always sorted ascending.

REVIEW 127435

9a22180... by Davide Gianforte <email address hidden>

FIXED : [ 349184 ] Don't use panel path when setting internal editor

In the internal editor settings, avoid to use current panel path when setting a string which is not
a full path (like when you manually reset to the default editor by insert "internal editor")

ed514dd... by Davide Gianforte <email address hidden>

Merge branch 'kde4' of git.kde.org:krusader into kde4

1c224b8... by Davide Gianforte <email address hidden>

FIXED: [ 317205 ] location bar not refreshed on ESC

panel refresh when we use esc button or click out the lineedit widget to get the current panel path back

de00671... by David Faure

Set cmake_min_req to match kdelibs4 policy, ensuring future cmake versions will still work.

46504aa... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

ed644b2... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

13fa966... by Yuri Chornoivan <email address hidden>

Get rid of 'the the's

42509ab... by Luigi Toscano

The warning has not printed in the last 10 years

The message was removed with the mountman refactoring 10 years ago,
see commit 8bc15d612df001f924a19c8708b0254eeb34bd7c
on "Fri Sep 17 17:36:08 2004 +0000", titled "new mountman"