[kbibtex] 01/10: Merge branch 'upstream/0.6+20160107git762e8425' into debian/0.6+20160107git762e8425

[Bastien ROUCARIES]

This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch debian/0.6+20160107git762e8425
in repository kbibtex.

commit 37a83990404745a602e41859e2f64ba882e183cc
Merge: 6da41e4 762e842
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Jan 11 23:25:23 2016 +0100

    Merge branch 'upstream/0.6+20160107git762e8425' into debian/0.6+20160107git762e8425

 README                                            |  6 ++--
 src/3rdparty/qoauth/src/interface.cpp             | 18 ++++++------
 src/data/comment.cpp                              |  6 ++++
 src/data/comment.h                                |  7 +++++
 src/data/entry.cpp                                |  7 +++++
 src/data/entry.h                                  |  7 +++++
 src/data/macro.cpp                                |  6 ++++
 src/data/macro.h                                  | 13 +++++++--
 src/data/preamble.cpp                             |  6 ++++
 src/data/preamble.h                               |  7 +++++
 src/data/value.cpp                                | 24 +++++++++++++++-
 src/data/value.h                                  | 35 +++++++++++++++++++++++
 src/global/kbibtex.cpp                            |  1 +
 src/global/preferences.cpp                        |  2 +-
 src/gui/element/elementwidgets.cpp                | 14 ++++-----
 src/gui/field/fieldlineedit.cpp                   | 12 ++++----
 src/gui/field/fieldlistedit.cpp                   |  2 +-
 src/gui/file/findduplicatesui.cpp                 |  2 --
 src/gui/file/sortfilterfilemodel.cpp              | 10 +++----
 src/gui/preferences/settingscolorlabelwidget.cpp  |  2 +-
 src/io/fileexporterbibtex.cpp                     |  6 +++-
 src/io/fileexporterbibtex.h                       |  7 +++++
 src/io/fileexporterxml.cpp                        |  4 +--
 src/io/fileimporter.cpp                           |  7 ++++-
 src/io/fileimporterbibtex.cpp                     |  4 +--
 src/networking/onlinesearch/onlinesearchjstor.cpp |  2 +-
 src/networking/zotero/oauthwizard.cpp             |  4 +--
 src/parts/part.cpp                                |  6 ++--
 src/processing/checkbibtex.cpp                    |  4 +--
 src/program/docklets/zoterobrowser.cpp            |  4 +--
 testset/bib/urls.bib                              |  8 ++++++
 31 files changed, 182 insertions(+), 61 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kbibtex.git