Skip to content
Dec 24, 2018
Merge branch 'master' of github.com:luojilab/Magic
# Conflicts:
#	src/Dialogs/SelectAnnotation.cpp
#	src/Dialogs/SelectAnnotation.h
#	src/Form_Files/SelectAnnotation.ui
#	src/Form_Files/main.ui
#	src/MainUI/MainWindow.cpp
#	src/main.cpp

@Lmonster Lmonster released this Nov 8, 2018 · 588 commits to master since this release

track library files

Former-commit-id: fbcd9d4ef7d4cbc8d08f52eb2ef080b17184e3ac
Assets 4

@Lmonster Lmonster released this Oct 23, 2018 · 662 commits to master since this release

fix:(engine) fix layout engine bug

Former-commit-id: dea62df6ce9ce0ab50f56f776d6f21b3f34bbbca
Assets 4
You can’t perform that action at this time.