seafile:add-vc-merge-module

Last commit made on 2020-12-08
Get this branch:
git clone -b add-vc-merge-module https://git.launchpad.net/seafile

Branch merges

Branch information

Name:
add-vc-merge-module
Repository:
lp:seafile

Recent commits

ed6a322... by sun <email address hidden>

Add vc merge module

f0097a7... by feiniks <email address hidden>

Support breakpad for windows (#2401)

1e34e85... by feiniks <email address hidden>

No need for byte alignment on windows (#2400)

7cdef94... by sun20121818 <email address hidden>

Update Qt version to 5.15.1 (#2398)

d9b0db8... by sun <email address hidden>

Corrected version number from 7.1.0 to 8.0.0

fffff82... by sun <email address hidden>

Update version to 7.1.0

cb877e0... by feiniks <email address hidden>

portable visual studio 2019 (#2378)

* portable visual studio 2019

* Need alignment and fix compile warning

* Define related headers in common.h

* del reference config.h

* Add files generated by vala

* Def reference config.h for windows

* Support vs build

Co-authored-by: sun <email address hidden>

88da64b... by feiniks <email address hidden>

Fix recreate invalid file name after delete it (#2393)

9fbc731... by feiniks <email address hidden>

Don't disable auto sync when failed to access worktree (#2392)

* Don't disable auto sync when failed to access worktree

* Use worktree invalid parameter

03dcd90... by feiniks <email address hidden>

Use socks5h for socks5 proxy (#2388)