sogo: fix-some-warnings 9cb1b899

Author Committer Branch Timestamp Parent
Patrice Levesque Patrice Levesque fix-some-warnings 2016-02-16 14:32 fix-some-warnings a5cc2bb5
Changeset

Merge branch 'master' into fix-some-warnings

Conflicts:
UI/Scheduler/UIxAppointmentActions.m

mod - ActiveSync/SOGoActiveSyncDispatcher+Sync.m Diff File
mod - ActiveSync/SOGoMailObject+ActiveSync.m Diff File
mod - NEWS Diff File
mod - SoObjects/Appointments/SOGoAppointmentObject.m Diff File
mod - SoObjects/Appointments/SOGoComponentOccurence.m Diff File
mod - UI/Scheduler/UIxAppointmentActions.m Diff File
mod - UI/Scheduler/UIxAppointmentEditor.m Diff File
mod - UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox Diff File
mod - UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox Diff File
mod - UI/Templates/SchedulerUI/UIxCalMainView.wox Diff File
mod - UI/Templates/SchedulerUI/UIxCalendarProperties.wox Diff File
mod - UI/WebServerResources/js/Common/navController.js Diff File
mod - UI/WebServerResources/js/Scheduler/CalendarListController.js Diff File
mod - UI/WebServerResources/js/Scheduler/Component.service.js Diff File
mod - UI/WebServerResources/js/Scheduler/ComponentController.js Diff File
mod - UI/WebServerResources/scss/components/dialog/dialog.scss Diff File