# HG changeset patch
# User PaulBeltyukov
# Date 1487237712 -18000
# Node ID 3291024e00da8d5f317118dc88ab5a4f6c0065ae
# Parent  6431f26aa50160943420a75a50f7560af6278e60# Parent  13d15a1ae899fbb74d56c2300835cff31edf3ff3
Merge

diff -r 13d15a1ae899 -r 3291024e00da .directory
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.directory	Thu Feb 16 14:35:12 2017 +0500
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2016,9,7,13,57,30
+ViewMode=1
+
+[Settings]
+HiddenFilesShown=true