Viewing all changes in revision 127.
- Committer: Victor Thompson
- Date: 2015-10-18 15:18:05 UTC
- mfrom: (125.1.16 reboot)
- Revision ID: victor.thompson@gmail.com-20151018151805-64ufoo69utfl0z27
Merge of trunk and resolve conflicts
- files added:
- po/am.po
- files renamed:
- app/data/key.js => app/data/keys.js
- files modified:
- app/components/DayDelegate.qml
expand all
collapse all
added
removed
