← Back to branch summary

~michihenning/unity-scopes-api/cache-results

~michihenning/unity-scopes-api/cache-results

Viewing all changes in revision 576.

Committer: Michi Henning
Date: 2015-01-20 04:34:17 UTC
mfrom: (163.27.5 unity-scopes-api)
Revision ID: michi.henning@canonical.com-20150120043417-bmu5qpmiu2cv6zfd

Merged trunk and resolved conflicts.

files modified:
CONFIGFILES

RELEASE_NOTES.md

debian/changelog

debian/libunity-scopes3.symbols

doc/tutorial.dox

include/unity/scopes/PreviewWidget.h

include/unity/scopes/internal/DfltConfig.h.in

include/unity/scopes/internal/RuntimeImpl.h

src/scopes/CategoryRenderer.cpp

src/scopes/PreviewWidget.cpp

src/scopes/internal/Logger.cpp

src/scopes/internal/ReplyImpl.cpp

src/scopes/internal/RuntimeImpl.cpp

Show diffs side-by-side

added added

removed removed

RELEASE_NOTES.md

debian/changelog

debian/libunity-scopes3.symbols

doc/tutorial.dox

include/unity/scopes/PreviewWidget.h

include/unity/scopes/internal/DfltConfig.h.in

include/unity/scopes/internal/RuntimeImpl.h

src/scopes/CategoryRenderer.cpp

src/scopes/PreviewWidget.cpp

src/scopes/internal/Logger.cpp

src/scopes/internal/ReplyImpl.cpp

src/scopes/internal/RuntimeImpl.cpp

Older »