From 421e6303ae9566bbff58188a7fbe74da4daccda9 Mon Sep 17 00:00:00 2001
From: Louis-Bertrand Varin <louisv@unito.io>
Date: Wed, 11 Jan 2017 21:05:16 -0500
Subject: [PATCH] Rename merge-databases -> kdbx-merge

---
 utils/CMakeLists.txt                          | 4 ++--
 utils/{merge-databases.cpp => kdbx-merge.cpp} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename utils/{merge-databases.cpp => kdbx-merge.cpp} (100%)

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 3887c9a22..31bb6db4f 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -25,8 +25,8 @@ target_link_libraries(kdbx-extract
                       ${GCRYPT_LIBRARIES}
                       ${ZLIB_LIBRARIES})
 
-add_executable(merge-databases merge-databases.cpp)
-target_link_libraries(merge-databases
+add_executable(kdbx-merge kdbx-merge.cpp)
+target_link_libraries(kdbx-merge
                       keepassx_core
                       ${MHD_LIBRARIES}
                       Qt5::Core
diff --git a/utils/merge-databases.cpp b/utils/kdbx-merge.cpp
similarity index 100%
rename from utils/merge-databases.cpp
rename to utils/kdbx-merge.cpp