← Back to branch summary

~rpadovani/reminders-app/1392197

~rpadovani/reminders-app/1392197

Viewing all changes in revision 286.3.4.

Committer: Michael Zanetti
Date: 2014-11-07 19:53:44 UTC
mfrom: (296 trunk)
mto: This revision was merged to the branch mainline in revision 297.
Revision ID: michael.zanetti@canonical.com-20141107195344-z3o1gx23sx043qz6

merge trunk

files added:
src/libqtevernote

src/libqtevernote/CMakeLists.txt

files renamed:
src/plugin/Evernote/evernoteconnection.cpp => src/libqtevernote/evernoteconnection.cpp

src/plugin/Evernote/evernoteconnection.h => src/libqtevernote/evernoteconnection.h

src/plugin/Evernote/jobs/ => src/libqtevernote/jobs/

src/plugin/Evernote/note.cpp => src/libqtevernote/note.cpp

src/plugin/Evernote/note.h => src/libqtevernote/note.h

src/plugin/Evernote/notebook.cpp => src/libqtevernote/notebook.cpp

src/plugin/Evernote/notebook.h => src/libqtevernote/notebook.h

src/plugin/Evernote/notebooks.cpp => src/libqtevernote/notebooks.cpp

src/plugin/Evernote/notebooks.h => src/libqtevernote/notebooks.h

src/plugin/Evernote/notes.cpp => src/libqtevernote/notes.cpp

src/plugin/Evernote/notes.h => src/libqtevernote/notes.h

src/plugin/Evernote/notesstore.cpp => src/libqtevernote/notesstore.cpp

src/plugin/Evernote/notesstore.h => src/libqtevernote/notesstore.h

src/plugin/Evernote/resource.cpp => src/libqtevernote/resource.cpp

src/plugin/Evernote/resource.h => src/libqtevernote/resource.h

src/plugin/Evernote/resourceimageprovider.cpp => src/libqtevernote/resourceimageprovider.cpp

src/plugin/Evernote/resourceimageprovider.h => src/libqtevernote/resourceimageprovider.h

src/plugin/Evernote/tag.cpp => src/libqtevernote/tag.cpp

src/plugin/Evernote/tag.h => src/libqtevernote/tag.h

src/plugin/Evernote/tags.cpp => src/libqtevernote/tags.cpp

src/plugin/Evernote/tags.h => src/libqtevernote/tags.h

src/plugin/Evernote/userstore.cpp => src/libqtevernote/userstore.cpp

src/plugin/Evernote/userstore.h => src/libqtevernote/userstore.h

src/plugin/Evernote/utils/ => src/libqtevernote/utils/

files modified:
3rdParty/evernote-sdk-cpp/CMakeLists.txt

3rdParty/libthrift/CMakeLists.txt

CMakeLists.txt

debian/control

po/am.po

po/ar.po

po/ast.po

po/az.po

po/bem.po

po/bg.po

po/br.po

po/ca.po

po/ca@valencia.po

po/ckb.po

po/com.ubuntu.reminders.pot

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hu.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lv.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sk.po

po/sl.po

po/sq.po

po/sr.po

po/st.po

po/sv.po

po/ta.po

po/tr.po

po/ug.po

po/uk.po

po/zh_CN.po

po/zh_TW.po

src/CMakeLists.txt

src/app/qml/components/PulldownListView.qml

src/app/qml/components/RemindersDelegate.qml

src/app/qml/ui/RemindersPage.qml

src/libqtevernote/jobs/fetchnotesjob.cpp

src/libqtevernote/jobs/fetchnotesjob.h

src/plugin/CMakeLists.txt

src/plugin/Evernote/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

3rdParty/evernote-sdk-cpp/CMakeLists.txt

3rdParty/libthrift/CMakeLists.txt

po/ca@valencia.po

po/com.ubuntu.reminders.pot

src/CMakeLists.txt

src/app/qml/components/PulldownListView.qml

src/app/qml/components/RemindersDelegate.qml

src/app/qml/ui/RemindersPage.qml

src/libqtevernote/

src/libqtevernote/CMakeLists.txt

src/libqtevernote/jobs/fetchnotesjob.cpp

src/libqtevernote/jobs/fetchnotesjob.h

src/libqtevernote/notesstore.cpp

src/libqtevernote/notesstore.h

src/plugin/CMakeLists.txt

src/plugin/Evernote/CMakeLists.txt

Older »