Git commit ae6ef194cf9b6657cd30b49b1cd6b9b312e2be77 by Nikita Melnichenko.
Committed on 25/08/2019 at 18:40.
Pushed by melnichenko into branch 'master'.

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

M  +17   -0    ChangeLog
M  +8    -2    doc-extras/ChangeLog
M  +2    -2    doc/index.docbook

https://commits.kde.org/krusader/ae6ef194cf9b6657cd30b49b1cd6b9b312e2be77

diff --cc doc-extras/ChangeLog
index cd9d9d13,8a1f72dd..71181abd
--- a/doc-extras/ChangeLog
+++ b/doc-extras/ChangeLog
@@@ -1,16 -1,13 +1,22 @@@
  The Krusader Handbook ChangeLog
  -------------------------------
  
++
 +2.x.x
 +=========================
 +Date: 20xx-xx-xx
 +
-  CHANGED: Rename SVNNEWS into NEWS in docs
-  FIXED: Updated links and used https:// where appropriate
 + CHANGED: Remove installation.docbook because in the majority of the cases, 
users
 +    install krusader as available in their distribution
 + Changed: Add documentation on the new options to move tabs left or right
 +
+ 2.7.2
+ =========================
+ Date: 2019-08-25
+ 
+  CHANGED: Rename SVNNEWS into NEWS in docs
+  FIXED: Updated links and used https:// where appropriate
+ 
  2.7.1 "Peace of Mind"
  ==========================
  Date: 2018-08-12

Reply via email to