pcp
[Top] [All Lists]

pcp updates: merge fix up

To: pcp@xxxxxxxxxxx
Subject: pcp updates: merge fix up
From: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue, 12 Jan 2016 06:32:02 +1100
Delivered-to: pcp@xxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0
Changes committed to git://git.pcp.io/kenj/pcp master


commit 913bdac64c943e99bbd4f775e9e375c831549aa0
Merge: 8c373ce 33ab008
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date:   Tue Jan 12 06:28:10 2016 +1100

    Merge branch 'master' of git://git.pcp.io/pcp/pcp

    Conflicts:
        debian/control.master

    merge my change and Nathan's most recent change.

<Prev in Thread] Current Thread [Next in Thread>
  • pcp updates: merge fix up, Ken McDonell <=