diff options
| author | Louis-Bertrand Varin <louisv@unito.io> | 2017-01-12 05:05:16 +0300 |
|---|---|---|
| committer | Louis-Bertrand Varin <louisv@unito.io> | 2017-01-12 05:05:16 +0300 |
| commit | 421e6303ae9566bbff58188a7fbe74da4daccda9 (patch) | |
| tree | ca061063d5e3a61f45cbb7ff5698565f3e00e6cc /utils | |
| parent | a79366f1059e55500614d94178d7d84603e962ac (diff) | |
Rename merge-databases -> kdbx-merge
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | utils/kdbx-merge.cpp (renamed from utils/merge-databases.cpp) | 0 |
2 files changed, 2 insertions, 2 deletions
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 index d67a87672..d67a87672 100644 --- a/utils/merge-databases.cpp +++ b/utils/kdbx-merge.cpp |