← Back to branch summary

~super-friends/qml-friends/raring

~super-friends/qml-friends/raring

Viewing all changes in revision 35.

Committer: Ken VanDine
Date: 2013-03-19 02:46:02 UTC
mfrom: (32.2.28 raring)
Revision ID: ken.vandine@canonical.com-20130319024602-mh9ldgol5sdtfm7x

Merged trunk

files added:
examples/streamview.qml

modules/Friends/plugin/streammodel.cpp

modules/Friends/plugin/streammodel.h

tests

tests/tests.pro

tests/unit

tests/unit/main.cpp

tests/unit/run.sh

tests/unit/tst_test.qml

tests/unit/unit.pro

files removed:
examples/streamview.qml

files modified:
debian/changelog

debian/control

friends.pro

modules/Friends/plugin/friendsutils.cpp

modules/Friends/plugin/friendsutils.h

modules/Friends/plugin/plugin.cpp

modules/Friends/plugin/plugin.h

modules/Friends/plugin/plugin.pro

Show diffs side-by-side

added added

removed removed

debian/changelog

examples/streamview.qml

examples/streamview.qml

modules/Friends/plugin/friendsutils.cpp

modules/Friends/plugin/friendsutils.h

modules/Friends/plugin/plugin.cpp

modules/Friends/plugin/plugin.h

modules/Friends/plugin/plugin.pro

modules/Friends/plugin/streammodel.cpp

modules/Friends/plugin/streammodel.h

tests/tests.pro

tests/unit/main.cpp

tests/unit/run.sh

tests/unit/tst_test.qml

tests/unit/unit.pro

Older »