Rename merge-databases -> kdbx-merge

2017-01-11 21:05:16 -05:00
parent a79366f105
commit 421e6303ae
2 changed files with 2 additions and 2 deletions
--- 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
--- a/utils/merge-databases.cpp
+++ b/utils/merge-databases.cpp