Viewing all changes in revision 1331.
- Committer: Michael Zanetti
- Date: 2014-10-15 19:50:21 UTC
- Revision ID: michael.zanetti@canonical.com-20141015195021-18iuilj3y3r1mb17
fix bad merge
- files modified:
- tests/qmltests/tst_Shell.qml
expand all
collapse all
added
removed
added
removed
