Viewing all changes in revision 160.1.1.
- Committer: Kaleo
- Date: 2012-11-30 20:13:01 UTC
- mfrom: (158.1.5 add-people-preview-proper)
- mto: (158.1.8 add-people-preview-proper)
- mto: This revision was merged to the branch mainline in revision 161.
- Revision ID: florian.boucault@canonical.com-20121130201301-rebrnj1ifacuxhb1
Merged lp:~saviq/manhattan/add-people-preview
- files added:
- Dash/People
- Dash/People/graphics
- files renamed:
- Dash/DashPeopleData.qml => Dash/People/PeopleData.qml
- Components/PeopleView.qml => Dash/People/PeopleView.qml
- graphics/people/avatar1.png => Dash/People/graphics/avatar1@18.png
- graphics/people/avatar2.png => Dash/People/graphics/avatar2@18.png
- graphics/people/avatar3.png => Dash/People/graphics/avatar3@18.png
- graphics/people/avatar4.png => Dash/People/graphics/avatar4@18.png
- graphics/people/avatar5.png => Dash/People/graphics/avatar5@18.png
- graphics/people/icon_facebook.png => Dash/People/graphics/icon_facebook@18.png
- graphics/people/icon_offline.png => Dash/People/graphics/icon_offline@18.png
- graphics/people/icon_online.png => Dash/People/graphics/icon_online@18.png
- graphics/people/icon_twitter.png => Dash/People/graphics/icon_twitter@18.png
- files modified:
- Dash/DashPeople.qml
expand all
collapse all
added
removed
Dash/People/graphics/icon_write_text@18.png
Dash/People/graphics/star_favourite@18.png
Dash/People/graphics/star_not_favourite@18.png
Dash/People/graphics/vertical_divider@18.png
