← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~aljsteiner/openlp/openlp into lp:openlp

 

Yes on windows 7 64 bit, the system we use for presentation on sunday.

Yes, probably did things in the wrong order.  it required a commit before I
merged in 1132 which was trunk.   And it found a lot of changes, but I
didn't do a diff.

I can try a revert and do it over if that would help.

On Tue, Dec 7, 2010 at 2:41 PM, Raoul Snyman <
raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx> wrote:

> There are large portions of removes and adds, are you developing on
> Windows?
> --
> https://code.launchpad.net/~aljsteiner/openlp/openlp/+merge/42998
> You are the owner of lp:~aljsteiner/openlp/openlp.
>



-- 
Albert Steiner

https://code.launchpad.net/~aljsteiner/openlp/openlp/+merge/42998
Your team OpenLP Core is requested to review the proposed merge of lp:~aljsteiner/openlp/openlp into lp:openlp.



References