mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 22:05:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed merge conflict, only one md5 needed.

Browse source
This commit is contained in:
Klaas Freitag 2012-08-23 17:43:21 +03:00
parent ede710843b
commit 9bd9949d68
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/csync_private.h
View file

@ -94,16 +94,16 @@ struct csync_s {
char *uri;
c_rbtree_t *tree;
c_list_t *list;
c_list_t *id_list;
enum csync_replica_e type;
unsigned long changes;
} local;
struct {
char *uri;
c_rbtree_t *tree;
c_list_t *list;
c_list_t *id_list;
enum csync_replica_e type;
unsigned long changes;
} remote;
struct {
@ -161,6 +161,7 @@ struct csync_file_stat_s {
mode_t mode; /* u32 */
int nlink; /* u32 */
int type; /* u32 */
char *destpath; /* for renames */
char *md5;
enum csync_instructions_e instruction; /* u32 */