« back to all changes in this revision
Viewing changes to apparmor/
- Committer: Kunal Parmar
- Date: 2014-01-31 01:35:20 UTC
- mfrom: (191 trunk)
- mto: This revision was merged to the branch mainline in revision 195.
- Revision ID: pkunal.parmar@gmail.com-20140131013520-a5puo0xjt7ige7c2
merge from trunk
- files added:
- CMakeLists.txt
- click
- files removed:
- apparmor
- files renamed:
- calendar-app => calendar-app.in *
- apparmor/calendar.json => click/apparmor.json
- manifest.json => click/manifest.json.in
- calendar-app.desktop => com.ubuntu.calendar_calendar.desktop.in
- files modified:
- DayView.qml
added
removed
apparmor/
