Viewing all changes in revision 138.3.104.
- Committer: Michael Terry
- Date: 2014-05-05 22:07:57 UTC
- mfrom: (881 unity8)
- mto: (138.5.2 split-logrotate)
- mto: This revision was merged to the branch mainline in revision 933.
- Revision ID: michael.terry@canonical.com-20140505220757-dwz5ulj42vz1ahxv
Merge from trunk
- files added:
- qml/Components/ZoomableImage.qml
- files renamed:
- build => build.sh
- run => run.sh *
- run_on_device => run_on_device.sh *
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
