Viewing all changes in revision 2780.
- Committer: Lukáš Tinkl
- Date: 2017-02-07 16:21:09 UTC
- mfrom: (2770.1.36 unity8)
- Revision ID: lukas.tinkl@canonical.com-20170207162109-a3hwou7ky4dxjxmi
merge trunk, resolve conflict
- files added:
- qml/Stage/ChildWindow.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
