Activity Log Manager

Merge lp://staging/~robert-ancell/activity-log-manager/unity-control-center2 into lp://staging/activity-log-manager

unity-control-center2
Merge into redesign

Proposed by Robert Ancell on 2014-01-27

Status:

Merged

Merge reported by:

Robert Ancell

Merged at revision:

not available

Proposed branch:

lp://staging/~robert-ancell/activity-log-manager/unity-control-center2

Merge into:

lp://staging/activity-log-manager

Diff against target:

462 lines (+266/-40)

10 files modified

configure.ac (+33/-0)
data/Makefile.am (+7/-5)
data/unity-activity-log-manager-panel.desktop.in (+25/-0)
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+12/-0)
src/Makefile.am (+7/-34)
src/alm-cc.c (+4/-0)
src/diagnostics-widget.c (+1/-1)
src/gnome-control-center/Makefile.am (+87/-0)
src/unity-control-center/Makefile.am (+89/-0)

To merge this branch:

bzr merge lp://staging/~robert-ancell/activity-log-manager/unity-control-center2

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-02-06
Activity Log Manager		2014-01-27	Pending
Review via email: mp+203431@code.staging.launchpad.net

Commit message

Add support for Unity Control Center.

lp://staging/~robert-ancell/activity-log-manager/unity-control-center2 updated on 2014-01-31

90. By Robert Ancell on 2014-01-30: Fix install directory for g-c-c panel
91. By Robert Ancell on 2014-01-30: Fix compiling panels with whoopsie support
92. By Robert Ancell on 2014-01-31: use correct syntax for automake if statements
93. By Robert Ancell on 2014-01-31: Append whoopsie libs, not replace duh
94. By Robert Ancell on 2014-01-31: Fix dist
95. By Robert Ancell on 2014-01-31: Really, truly enable the whoopsie dialog this time