mirror of
https://github.com/uroni/urbackup_backend.git
synced 2025-10-26 11:36:50 +00:00
Conflicts: urbackupclient/ChangeJournalWatcher.cpp urbackupclient/ChangeJournalWatcher.h urbackupclient/client.cpp urbackupclient/urbackupclient.vcxproj.filters urbackupcommon/os_functions_win.cpp urbackupserver/dao/ServerBackupDao.cpp urbackupserver/dao/ServerBackupDao.h urbackupserver/fileclient/FileClientChunked.cpp urbackupserver/filedownload.cpp urbackupserver/server_hash.cpp urbackupserver/server_hash.h |
||
|---|---|---|
| .. | ||
| adler32.cpp | ||
| adler32.h | ||
| data.cpp | ||
| data.h | ||
| miniz.c | ||