Viewing all changes in revision 981.1.18.
- Committer: Michael Terry
- Date: 2014-07-25 13:37:32 UTC
- mfrom: (1080 unity8)
- mto: (1086.1.4 unity8)
- mto: This revision was merged to the branch mainline in revision 1087.
- Revision ID: michael.terry@canonical.com-20140725133732-bqlhe8gvhyyaujsw
Merge from trunk
- files added:
- .settings
- files removed:
- qml/Components/FilterGrid.qml
- files renamed:
- tests/autopilot/.project => .project
- tests/autopilot/.pydevproject => .pydevproject
- qml/Dash/CardFilterGrid.qml => qml/Dash/CardGrid.qml
- files modified:
- debian/changelog
expand all
collapse all
added
removed
