Merge branch 'master' into development
62b1bc1f461d
Actions

Authored by Bruno Miguel Queiros <bqueiros@gmail.com> on Dec 1 2018, 10:08 PM.

Description

Merge branch 'master' into development

Committed

Bruno Miguel Queiros <bqueiros@gmail.com>

Dec 1 2018, 10:08 PM

Parents

Branches

Unknown

Tags

Unknown

Bruno Miguel Queiros <bqueiros@gmail.com> committed R1008:62b1bc1f461d: Merge branch 'master' into development (authored by Bruno Miguel Queiros <bqueiros@gmail.com>).Dec 1 2018, 10:08 PM

Commit	Author	Details	Committed
075e468e1754	Bruno Miguel Queiros	add debian folder	Dec 1 2018
12a619baa36b	Bruno Miguel Queiros	add debian folder	Dec 1 2018
83ee3e2c63e1	Bruno Miguel Queiros	Add debian folder	Dec 1 2018
b3aa8f68d8f4	Bruno Miguel Queiros	Add debian folder	Dec 1 2018
a275bf815798	Bruno Miguel Queiros	Add debian folder	Dec 1 2018
a43c8406f004	Camilo higuita	also now remove abstract tags	Nov 27 2018
61838cd1e528	Camilo higuita	update to new mauikit shared tagging components	Nov 27 2018
8eb9d0745631	Camilo higuita	push latest changes	Nov 16 2018

		Path
A		.travis.yml
A	(dir)	debian/
A		debian/changelog
A		debian/compat
A		debian/control
A		debian/copyright
A		debian/rules
A	(dir)	debian/source/
A		debian/source/format
M		main.cpp
M		src/db/db.h
M		src/models/basemodel.cpp
M		src/models/links/links.cpp
M		src/models/notes/notes.cpp
M		src/models/notes/notes.h
M		src/views/books/BooksView.qml
M		src/views/links/LinksView.qml
M		src/views/links/Previewer.qml
M		src/views/notes/NotesView.qml
M		src/widgets/NewLinkDialog.qml
M		src/widgets/NewNoteDialog.qml
A		travis-build.sh