Activity Log Manager

Merge lp://staging/~cando/activity-log-manager/vala into lp://staging/activity-log-manager/0.8

vala
Merge into trunk

Proposed by Stefano Candori on 2012-01-15

Status:	Rejected
Rejected by:	Manish Sinha (मनीष सिन्हा) on 2012-02-09
Proposed branch:	lp://staging/~cando/activity-log-manager/vala
Merge into:	lp://staging/activity-log-manager/0.8
Diff against target:	656 lines (+590/-0) (has conflicts) 12 files modified COPYING (+166/-0) ChangeLog (+2/-0) Makefile.am (+21/-0) autogen.sh (+157/-0) configure.ac (+25/-0) src/Makefile.am (+30/-0) src/activity-log-manager.vala (+44/-0) src/alm.vala (+53/-0) src/applications-widget.vala (+27/-0) src/config.vapi (+11/-0) src/files-widget.vala (+27/-0) src/history-widget.vala (+27/-0) Conflict adding file COPYING. Moved existing file to COPYING.moved.
To merge this branch:	bzr merge lp://staging/~cando/activity-log-manager/vala
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Activity Log Manager		2012-01-15	Pending
Review via email: mp+88605@code.staging.launchpad.net

Description of the change

I've cleaned up the vala branch and added other little things (advanced tab):this branch is the result.
I suggest to use this branch instead of the old one.

Revision history for this message

Seif Lotfy (seif) wrote on 2012-01-15:

we will not use the advanced tab for the rewrite

On Sun, Jan 15, 2012 at 12:55 PM, Stefano Candori <<email address hidden>
> wrote:

> Stefano Candori has proposed merging lp:~cando/activity-log-manager/vala
> into lp:activity-log-manager.
>
> Requested reviews:
> Activity Log Manager (activity-log-manager)
>
> For more details, see:
> https://code.launchpad.net/~cando/activity-log-manager/vala/+merge/88605
>
> I've cleaned up the vala branch and added other little things (advanced
> tab):this branch is the result.
> I suggest to use this branch instead of the old one.
> --
> https://code.launchpad.net/~cando/activity-log-manager/vala/+merge/88605
> You are subscribed to branch lp:activity-log-manager.
>