Viewing all changes in revision 1170.
- Committer: Rick Harding
- Date: 2013-10-30 13:23:16 UTC
- mfrom: (1157.2.8 juju-gui)
- Revision ID: rick.harding@canonical.com-20131030132316-99m7ixt3obidh2sm
Merge with trunk
- files removed:
- app/assets/images/email-click.png
- files renamed:
- app/assets/images/field-changed.png => app/assets/images/non-sprites/field-changed.png
- app/assets/images/field-conflict-14.png => app/assets/images/non-sprites/field-conflict-14.png
- app/assets/images/field-conflict.png => app/assets/images/non-sprites/field-conflict.png
- app/assets/images/field-resolved.png => app/assets/images/non-sprites/field-resolved.png
- app/assets/images/field-saved-finished.png => app/assets/images/non-sprites/field-saved-finished.png
- app/assets/images/field-saved.png => app/assets/images/non-sprites/field-saved.png
- app/assets/images/form-validation-cross.png => app/assets/images/non-sprites/form-validation-cross.png
- app/assets/images/form-validation-tick.png => app/assets/images/non-sprites/form-validation-tick.png
- app/assets/images/landscape_restart_menu.png => app/assets/images/non-sprites/landscape_restart_menu.png
- app/assets/images/landscape_security_menu.png => app/assets/images/non-sprites/landscape_security_menu.png
- app/assets/images/paper-bg.jpg => app/assets/images/non-sprites/paper-bg.jpg
- app/assets/images/pattern_tile.png => app/assets/images/non-sprites/pattern_tile.png
- files modified:
- Makefile
expand all
collapse all
added
removed
app/assets/images/email-click.png
app/assets/images/fullscreen_icon.png
app/assets/images/google-click.png
app/assets/images/inspector-charm-scale-up.png
app/assets/images/landscape_restart.png
app/assets/images/sidebar_icon.png
app/assets/images/twitter-click.png
