On 05/09/2014 09:32 AM, Nathan Scott wrote:
Hi all,
The pcp-gui<->pcp git tree merge is now done & in the dev branch.
looks like all the commit/revision history for the pcp-gui bits didn't
survive the move .. was that intentional? Does it matter?
e.g.
# git log src/pmchart/main.cpp
commit 353590b93dda7bf2c6c13aa8d96210c61c9dc3bd
Merge: 153a033 a6a1440
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Fri May 9 08:48:23 2014 +1000
Stitch the pcp-gui and pcp git trees back together again
Following up on discussion from the last two developers meetings,
this commit merges the pcp-gui tree back into pcp. This includes
all of the commands, man pages, books, QA, configury, and so on.
The configure script will now dynamically switch on/off the Qt
components depending on whether a viable (4.4+) Qt toolchain is
found.
commit 54ec46ad714c2ed2960f909039f1e77660f4b9cc
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue May 6 14:17:12 2014 +1000
Switch to the naming conventions used in pcp git tree
Rename several src subdirs to match the convention used
in the pcp tree, in preparation for merging.
Cheers
-- Mark
|