On Tue, Dec 21, 2010 at 8:29 PM, James Cammarata <sngx-admin(a)sngx.net> wrote:
On Tue, Dec 21, 2010 at 8:26 PM, James Cammarata
<sngx-admin(a)sngx.net> wrote:
>>> I should be able to merge our work together without too much of an issue.
>>
>> If you are cool with the additional work, I'm fine with that. Thanks much.
>
> Don't mind at all, working on merging it now. Chuck's tree merged in
> cleanly with mine actually, so it's just a matter of diffing our files
> and reconciling the little differences here and there. I'm actually
> done with merging his ubuntu module in with mine, doing debian next.
>
Actually, done with that :) The diffs were 99% superficial, just
differences between debian/ubuntu mostly. Testing now, I'll push to
github when I'm done.
Done and pushed to github:
commit 0e2f497df8dc9603e7dd8f574d99a98f4c34995e
Author: James Cammarata <jimi(a)sngx.net>
Date: Tue Dec 21 21:12:07 2010 -0600
Merged work in the import-modules branch with the debian/ubuntu
modules created by Chuck Short
commit 5503d7a2dd7bc270854af30fec9c779a50fe47bd
Merge: d76d228... 9554181...
Author: James Cammarata <jimi(a)sngx.net>
Date: Tue Dec 21 20:10:48 2010 -0600
Merge branch 'cshort' into import-modules