Viewing all changes in revision 679.
- Committer: Loïc Molinari
- Date: 2013-08-15 15:19:59 UTC
- mfrom: (675.1.8 ubuntu-ui-toolkit-shape2)
- Revision ID: loic.molinari@canonical.com-20130815151959-hm7e0b9jqni1f1x3
Merged main branch.
- files renamed:
- modules/Ubuntu/Components/plugin/ubuntushape.cpp => modules/Ubuntu/Components/plugin/ucubuntushape.cpp
- modules/Ubuntu/Components/plugin/ubuntushape.h => modules/Ubuntu/Components/plugin/ucubuntushape.h
- files modified:
- modules/Ubuntu/Components/plugin/plugin.cpp
expand all
collapse all
added
removed
