Skip to content
Commit ae6ef194 authored by Nikita Melnichenko's avatar Nikita Melnichenko
Browse files

Merged v2.7.2 updates

# Resolved conflicts:
#	CMakeLists.txt
#	doc-extras/ChangeLog
#	doc/faq.docbook
#	doc/help.docbook
#	doc/installation.docbook
#	krArc/krarc.cpp
#	krusader/GUI/kcmdline.h
#	krusader/KViewer/lister.cpp
#	krusader/KViewer/panelviewer.h
#	krusader/Konfigurator/konfiguratoritems.h
#	krusader/Panel/PanelView/krview.h
#	krusader/Panel/listpanelactions.cpp
#	krusader/Panel/panelcontextmenu.cpp
#	krusader/Panel/panelfunc.cpp
#	krusader/Search/krsearchdialog.cpp
#	krusader/Synchronizer/synchronizer.cpp
#	krusader/Synchronizer/synchronizergui.cpp
#	krusader/Synchronizer/synchronizergui.h
#	krusader/Synchronizer/synchronizertask.h
#	krusader/krusader.h
#	krusader/org.kde.krusader.appdata.xml
parents b97f3159 f66e9fe2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment