comparison: dav/sync.h
dav/sync.h
- changeset 529
- dc3f82b04733
- parent 527
- d0e37224eba1
- child 533
- 5b9f20aa88c2
equal
deleted
inserted
replaced
| 528:4c9c8c017d52 | 529:dc3f82b04733 |
|---|---|
| 160 | 160 |
| 161 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); | 161 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
| 162 | 162 |
| 163 int cmd_resolve_conflicts(CmdArgs *args); | 163 int cmd_resolve_conflicts(CmdArgs *args); |
| 164 int cmd_delete_conflicts(CmdArgs *args); | 164 int cmd_delete_conflicts(CmdArgs *args); |
| 165 | |
| 166 int cmd_list_versions(CmdArgs *args); | |
| 165 | 167 |
| 166 int cmd_trash_info(CmdArgs *args); | 168 int cmd_trash_info(CmdArgs *args); |
| 167 int cmd_empty_trash(CmdArgs *args); | 169 int cmd_empty_trash(CmdArgs *args); |
| 168 | 170 |
| 169 int cmd_add_tag(CmdArgs *args); | 171 int cmd_add_tag(CmdArgs *args); |
