Viewing all changes in revision 360.
- Committer: mike.mccracken at canonical
- Date: 2012-10-17 07:21:28 UTC
- mfrom: (356.2.13 ubuntuone-control-panel)
- Revision ID: mike.mccracken@canonical.com-20121017072128-83k29gn8fnzn3xsh
merge with trunk and resolve conflict
- files added:
- ubuntuone/controlpanel/gui/qt/main/darwin.py
- files modified:
- data/qt/ubuntuone.qss
expand all
collapse all
added
removed
