Viewing all changes in revision 33.
- Committer: Christopher Lee
- Date: 2013-08-22 02:57:07 UTC
- mfrom: (8.2.7 trunk)
- Revision ID: chris.lee@canonical.com-20130822025707-f5w3llpivbcxzunz
Merge trunk, resolve conflict in Keyboard.qml
- files modified:
- debian/changelog
expand all
collapse all
added
removed
