FOSDEM 2016

[RA Stehmann]

Hello,

you can find my report about the FOSDEM 2016 and the Apache booth (in
german language) with a picture under:

http://blogs.fsfe.org/stehmann/?p=1703

Kind regards
Michael



signature.asc
Description: OpenPGP digital signature

Re: FOSDEM 2016

[Kay Schenk]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


On 02/15/2016 01:29 AM, RA Stehmann wrote:
> Hello,
> 
> you can find my report about the FOSDEM 2016 and the Apache
> booth (in german language) with a picture under:
> 
> http://blogs.fsfe.org/stehmann/?p=1703
> 
> Kind regards Michael
> 

As always, thank you for this wonderful report! Especially
considering your somewhat complicated journey to get to Brussels
this time, we are more than grateful that you and Mechtilde
could represent Apache OpenOffice at this important event.

- -- 
- 
MzK

"Though no one can go back and make a brand new start,
 anyone can start from now and make a brand new ending."
-- Carl Bard
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.14 (GNU/Linux)

iQEcBAEBAgAGBQJWwf2AAAoJEJ8zlgVF1GcunL8H/1+SmAOZXLojp7ytXjnf1ur0
yhbwaMeB+Lf6xGA0m28b9NjfmutjwqmrPsSumBxCpvb+sRf4OrzZxZzMt6lBS2I7
t+Bc+feKIqr3EKI2qyxLU8owL0eR89RxBeXeiLRRN/8XYy1PI+xCJeEpgZxfI3or
IYwQSlipBz70XsSiYpgJlF4O3vtD5VcIbsfq2aCzuC3oxEi5/jy9x1eZkd52th5C
rOez87QK6IDu/kRExZWNOT/btOg7v9+vROgk5dW+SCj1NXeiq+/GzdSPvD/9dIH9
bYp9jwXndZpy8f2AaDJ9vaU7g/PtmLrVLtHQyx9fYNhXh+b3eaUNviG7YAJUWNc=
=jbIu
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: SVN to BZ robot not working

[Kay Schenk]

On 02/14/2016 06:26 PM, Damjan Jovanovic wrote:
> I think infra has been fixing things lately (eg. the changes to
> https://ci.apache.org/projects/openoffice/index.html went through).
> Maybe this was one of them.
> 
> On Mon, Feb 15, 2016 at 3:29 AM, Dennis E. Hamilton
>  wrote:
>> I just saw Kay's SVN to BZ commit message for the patch of mine she 
>> submitted earlier.
>>
>> See Comment 16 at the bottom of 
>> https://bz.apache.org/ooo/show_bug.cgi?id=126635#c16
>>
>> Maybe it was just delay to BZ and then from BZ to the CC: to Kay.
>>
>>  - Dennis

@ Damjan...I don't think this is included. It's kind of a "special"
scenario for us. The scripts are located in:

https://svn.apache.org/repos/infra/infrastructure/trunk/projects/svn2bz/

See further details on initial setup in:
https://issues.apache.org/jira/browse/INFRA-5004

(yeah, we need to put this info somewhere!)

I don't even know what Apache service this runs on and thatt would help.

@ Dennis. I put those svn revision notes in manually. Actual SVN
"bot" type comments can be see in:

https://bz.apache.org/ooo/show_bug.cgi?id=20542

Comment from "SVN Robot"

>>
>>
>>> -Original Message-
>>> From: Damjan Jovanovic [mailto:dam...@apache.org]
>>> Sent: Sunday, February 14, 2016 16:53
>>> To: Apache OO 
>>> Subject: Re: SVN to BZ robot not working
>>>
>>> Please do, IIRC it's been broken for a few months...
>>>
>>> On Sun, Feb 14, 2016 at 11:30 PM, Kay Schenk 
>>> wrote:
 Hello, it looks like the SVN to BZ robot has stopped working again.
 Does anyone know how to restart it? If not, I'll contact infra.

 From an old message from Herbert Duerr last year --
 http://markmail.org/message/az6bjwdtw72g3llw

 Should we contact infra for more involvement in starting and
 stopping this serivce?
 --
 
 MzK

 "Though no one can go back and make a brand new start,
  anyone can start from now and make a brand new ending."
 -- Carl Bard

 -
 To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
 For additional commands, e-mail: dev-h...@openoffice.apache.org

>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
>>> For additional commands, e-mail: dev-h...@openoffice.apache.org
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
>> For additional commands, e-mail: dev-h...@openoffice.apache.org
>>
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
> For additional commands, e-mail: dev-h...@openoffice.apache.org
> 

-- 

MzK

"Though no one can go back and make a brand new start,
 anyone can start from now and make a brand new ending."
-- Carl Bard

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: SVN to BZ robot not working

[Kay Schenk]

[top posting]

further info after my #irc session.

This service is supposedly running on http://ooo-wiki2-vm.apache.org/

and has a startup script in /etc/init.d

"We" have infra access to this box(?)
Infra claims it's "connected" but...

Let's see if the script needs to be changed?
We may need additional rights to re-commit.


On 02/15/2016 08:58 AM, Kay Schenk wrote:
> 
> 
> On 02/14/2016 06:26 PM, Damjan Jovanovic wrote:
>> I think infra has been fixing things lately (eg. the changes to
>> https://ci.apache.org/projects/openoffice/index.html went through).
>> Maybe this was one of them.
>>
>> On Mon, Feb 15, 2016 at 3:29 AM, Dennis E. Hamilton
>>  wrote:
>>> I just saw Kay's SVN to BZ commit message for the patch of mine she 
>>> submitted earlier.
>>>
>>> See Comment 16 at the bottom of 
>>> https://bz.apache.org/ooo/show_bug.cgi?id=126635#c16
>>>
>>> Maybe it was just delay to BZ and then from BZ to the CC: to Kay.
>>>
>>>  - Dennis
> 
> @ Damjan...I don't think this is included. It's kind of a "special"
> scenario for us. The scripts are located in:
> 
> https://svn.apache.org/repos/infra/infrastructure/trunk/projects/svn2bz/
> 
> See further details on initial setup in:
> https://issues.apache.org/jira/browse/INFRA-5004
> 
> (yeah, we need to put this info somewhere!)
> 
> I don't even know what Apache service this runs on and thatt would help.
> 
> @ Dennis. I put those svn revision notes in manually. Actual SVN
> "bot" type comments can be see in:
> 
> https://bz.apache.org/ooo/show_bug.cgi?id=20542
> 
> Comment from "SVN Robot"
> 
>>>
>>>
 -Original Message-
 From: Damjan Jovanovic [mailto:dam...@apache.org]
 Sent: Sunday, February 14, 2016 16:53
 To: Apache OO 
 Subject: Re: SVN to BZ robot not working

 Please do, IIRC it's been broken for a few months...

 On Sun, Feb 14, 2016 at 11:30 PM, Kay Schenk 
 wrote:
> Hello, it looks like the SVN to BZ robot has stopped working again.
> Does anyone know how to restart it? If not, I'll contact infra.
>
> From an old message from Herbert Duerr last year --
> http://markmail.org/message/az6bjwdtw72g3llw
>
> Should we contact infra for more involvement in starting and
> stopping this serivce?
> --
> 
> MzK
>
> "Though no one can go back and make a brand new start,
>  anyone can start from now and make a brand new ending."
> -- Carl Bard
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
> For additional commands, e-mail: dev-h...@openoffice.apache.org
>

 -
 To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
 For additional commands, e-mail: dev-h...@openoffice.apache.org
>>>
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
>>> For additional commands, e-mail: dev-h...@openoffice.apache.org
>>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
>> For additional commands, e-mail: dev-h...@openoffice.apache.org
>>
> 

-- 

MzK

"Though no one can go back and make a brand new start,
 anyone can start from now and make a brand new ending."
-- Carl Bard

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Food for Thought

[Dennis E. Hamilton]

The Apache OpenOffice project, and other Apache projects, are more like 
do-ocracies than any other form of project governance.  The distinct karma for 
committers and also PMC members is fundamentally related to the Foundation 
requirements concerning IP provenance of project code bases and other 
artifacts, although that is often referred to as a meritocracy arrangement.  

For example, no one on the Apache OpenOffice project has executive authority, 
although there are particular accountabilities for committers, PMC members, and 
the PMC Chair (who is an officer of the Foundation).

For another example, there are no assignments to give out or ways other than 
suggestion and recommendation to direct effort.  This is probably what is most 
confusing to outsiders and also to the many advocates for AOO who would like to 
see particular expressed needs met.  

 -- Dennis E. Hamilton
orc...@apache.org
dennis.hamil...@acm.org+1-206-779-9430
https://keybase.io/orcmid  PGP F96E 89FF D456 628A
X.509 certs used and requested for signed e-mail



-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: Food for Thought

[Patricia Shanahan]

On 2/15/2016 1:15 PM, Dennis E. Hamilton wrote:



The Apache OpenOffice project, and other Apache projects, are more
like do-ocracies than any other form of project governance.  The
distinct karma for committers and also PMC members is fundamentally
related to the Foundation requirements concerning IP provenance of
project code bases and other artifacts, although that is often
referred to as a meritocracy arrangement.

For example, no one on the Apache OpenOffice project has executive
authority, although there are particular accountabilities for
committers, PMC members, and the PMC Chair (who is an officer of the
Foundation).

For another example, there are no assignments to give out or ways
other than suggestion and recommendation to direct effort.  This is
probably what is most confusing to outsiders and also to the many
advocates for AOO who would like to see particular expressed needs
met.



I think this may be more confusing for AOO than for many projects 
because most users are not in a position to join the do-ocracy.


My other OO project, Apache River, is a system that is written in Java 
and primarily used by Java programmers. A user who wants a particular 
bug fixed has the option of checking out the source code and developing 
their own fix. Many other OO projects are written in Language X by and 
for X programmers.


The typical AOO user is a Windows-using non-programmer. I found just 
building AOO on Windows a challenging two week project, for which I 
needed a lot of help, despite prior familiarity with Subversion and 
Cygwin. As a practical matter, most people who need a bug fixed to make 
AOO useful to them simply do not have the option of taking it into their 
own hands.


Incidentally, that cultural difference may affect the severity of data 
loss bugs. I find someone working for an extended period on a document 
with no revision control or off-site backup a little shocking at first 
sight. Then I realized I learned about the importance of revision 
control and off-site backup on the job, not in my non-programming life.


Maybe it would be helpful for the PMC to select a very, very short "Most 
wanted" list, based on user requests, feedback at conferences etc. That 
would help new AOO recruits pick a focus.


Patricia



-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: [VOTE] Release Java Bootstrap Connector via Maven

[Marcus]

+0

I'm sorry but I cannot test anything with your RC as I'm not a developer 
and therefore don't know how to handle this. So, I cannot give you a 
positive vote for it.


However, I would like to express at least my positive opinion with a 
"0+" and not with a "-1".


I hope you can understand my dilemma.

Marcus



Am 02/12/2016 03:59 AM, schrieb Carl Marcum:

I have the release candidate staged in the Apache Nexus repository [1]
that includes a separate source and javadoc jar all pgp signed by myself.

All jars contain a META-INF directory with LICENSE, NOTICE, and CREDIT
files.

The source jar contains the java source but SVN [2] also contains the
Gradle build system that can create the jars, pgp sign them and
optionally upload.

Testing:
I have attached a Groovy script to the issue created for adding the code
to SVN [3].
This script will demonstrate a bootstrap connection.
A working Groovy installation (and Java runtime) is necessary.

Place the bootstrap-connector jar for testing in ~/.groovy/lib/
directory or somewhere else on the Groovy classpath.

Edit the script to point to your soffice executable directory.
example for windows (note forward slashes):
String oooExeFolder = "C:/Program Files (x86)/OpenOffice 4/program"

Run with: groovy BootstrapTest.groovy
You should see:
Connected to a running office ...

Voting will close Wednesday February 17th at midnight GMT.
3 binding +1 votes and a simple majority of votes are necessary for
approval.


[1]
https://repository.apache.org/content/repositories/orgapacheopenoffice-1015/org/openoffice/bootstrap-connector/0.1.1/

[2]
https://svn.apache.org/repos/asf/openoffice/devtools/bootstrap-connector/trunk/

[3] https://bz.apache.org/ooo/show_bug.cgi?id=126807

__

[ ] +1 approve the release
[ ] +0
[ ] -0
[ ] -1 not approve the release


-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: SVN to BZ robot not working

[Andrea Pescetti]

Kay Schenk wrote:

This service is supposedly running on [...] ooo-wiki2-vm.apache.org


Good find. This is undocumented apparently. I confirm the service has 
been not operational (meaning that I didn't see the bot working and I 
resorted to manually annotating issues much like Kay did) since around 
the 4.1.2 release.



and has a startup script in /etc/init.d
"We" have infra access to this box(?)


I do have access to that machine, and I have had full access since 
December 2015, when I did some MWiki updates. I confirm there is a 
/etc/init.d/svn2bz init script, and from there I do have access to the 
script (Python).


It is a huge leap forward to know that the script is on a machine we 
control. I've added it to the internal documentation for that machine.



Infra claims it's "connected" but...


I confirm that, according to the logs I see, the bot is seeing commits 
(for example, it saw my commit that updated the internal documentation; 
it sees commits to ASF projects and to the Infra internal repository). 
Please use the following format for your next OpenOffice commit

"#i123456# Description of the fix"
and we will see what appears in the logs. Maybe the script was simply 
inactive, maybe it needs to be fixed.


Regards,
  Andrea.

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: [DISCUSS] Release Java Bootstrap Connector via Maven

[Carl Marcum]

On 02/15/2016 05:21 PM, Marcus wrote:

+0

I'm sorry but I cannot test anything with your RC as I'm not a 
developer and therefore don't know how to handle this. So, I cannot 
give you a positive vote for it.


However, I would like to express at least my positive opinion with a 
"0+" and not with a "-1".


I hope you can understand my dilemma.

Marcus


Marcus,

Of course I do.

Thanks for your input !

Carl

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: SVN to BZ robot not working

[Kay Schenk]

On 02/15/2016 02:40 PM, Andrea Pescetti wrote:
> Kay Schenk wrote:
>> This service is supposedly running on [...] ooo-wiki2-vm.apache.org
> 
> Good find. This is undocumented apparently. I confirm the service
> has been not operational (meaning that I didn't see the bot working
> and I resorted to manually annotating issues much like Kay did)
> since around the 4.1.2 release.
> 
>> and has a startup script in /etc/init.d
>> "We" have infra access to this box(?)
> 
> I do have access to that machine, and I have had full access since
> December 2015, when I did some MWiki updates. I confirm there is a
> /etc/init.d/svn2bz init script, and from there I do have access to
> the script (Python).
> 
> It is a huge leap forward to know that the script is on a machine we
> control. I've added it to the internal documentation for that machine.
> 
>> Infra claims it's "connected" but...
> 
> I confirm that, according to the logs I see, the bot is seeing
> commits (for example, it saw my commit that updated the internal
> documentation; it sees commits to ASF projects and to the Infra
> internal repository). Please use the following format for your next
> OpenOffice commit
> "#i123456# Description of the fix"
> and we will see what appears in the logs.

OK, will do.

 Maybe the script was
> simply inactive, maybe it needs to be fixed.

Progress! anyway.

As I indicated with my other message, the svn for this is supposedly at:
https://svn.apache.org/repos/infra/infrastructure/trunk/projects/svn2bz/

but it seems to be missing an actual "svn2bz.conf". If this is
installed on ooo-wiki2-vm.apache.org, you might check if the URL to
our BZ is still valid, etc. That's all the help I can provide at the
moment.

> 
> Regards,
>   Andrea.
> 


-- 

MzK

"Though no one can go back and make a brand new start,
 anyone can start from now and make a brand new ending."
-- Carl Bard

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

RE: [DISCUSS] Release Java Bootstrap Connector via Maven

[Dennis E. Hamilton]

In case it is useful in this case, be aware that it is the last vote cast by 
any individual that matters when you finally count them.

It is not necessary to end the voting if you fall short of the votes you need.  
You can leave the [VOTE] open and see how one can assist in obtaining necessary 
affirmative binding votes.

 - Dennis

> -Original Message-
> From: Carl Marcum [mailto:cmar...@apache.org]
> Sent: Monday, February 15, 2016 14:47
> To: dev@openoffice.apache.org
> Subject: Re: [DISCUSS] Release Java Bootstrap Connector via Maven
> 
> On 02/15/2016 05:21 PM, Marcus wrote:
> > +0
> >
> > I'm sorry but I cannot test anything with your RC as I'm not a
> > developer and therefore don't know how to handle this. So, I cannot
> > give you a positive vote for it.
> >
> > However, I would like to express at least my positive opinion with a
> > "0+" and not with a "-1".
> >
> > I hope you can understand my dilemma.
> >
> > Marcus
> >
> Marcus,
> 
> Of course I do.
> 
> Thanks for your input !
> 
> Carl
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
> For additional commands, e-mail: dev-h...@openoffice.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

RE: [VOTE] Release Java Bootstrap Connector via Maven

[Dennis E. Hamilton]

+0 from me too.

This is just a ping.  I want to examine the source packaging and try compiling 
the jars but not at the moment.  More feedback soon.

> -Original Message-
> From: Marcus [mailto:marcus.m...@wtnet.de]
> Sent: Monday, February 15, 2016 14:21
> To: dev@openoffice.apache.org
> Subject: Re: [VOTE] Release Java Bootstrap Connector via Maven
> 
> +0
> 
> I'm sorry but I cannot test anything with your RC as I'm not a developer
> and therefore don't know how to handle this. So, I cannot give you a
> positive vote for it.
> 
> However, I would like to express at least my positive opinion with a
> "0+" and not with a "-1".
> 
> I hope you can understand my dilemma.
> 
> Marcus
> 
> 
> 
> Am 02/12/2016 03:59 AM, schrieb Carl Marcum:
> > I have the release candidate staged in the Apache Nexus repository [1]
> > that includes a separate source and javadoc jar all pgp signed by
> myself.
> >
> > All jars contain a META-INF directory with LICENSE, NOTICE, and CREDIT
> > files.
> >
> > The source jar contains the java source but SVN [2] also contains the
> > Gradle build system that can create the jars, pgp sign them and
> > optionally upload.
> >
> > Testing:
> > I have attached a Groovy script to the issue created for adding the
> code
> > to SVN [3].
> > This script will demonstrate a bootstrap connection.
> > A working Groovy installation (and Java runtime) is necessary.
> >
> > Place the bootstrap-connector jar for testing in ~/.groovy/lib/
> > directory or somewhere else on the Groovy classpath.
> >
> > Edit the script to point to your soffice executable directory.
> > example for windows (note forward slashes):
> > String oooExeFolder = "C:/Program Files (x86)/OpenOffice 4/program"
> >
> > Run with: groovy BootstrapTest.groovy
> > You should see:
> > Connected to a running office ...
> >
> > Voting will close Wednesday February 17th at midnight GMT.
> > 3 binding +1 votes and a simple majority of votes are necessary for
> > approval.
> >
> >
> > [1]
> >
> https://repository.apache.org/content/repositories/orgapacheopenoffice-
> 1015/org/openoffice/bootstrap-connector/0.1.1/
> >
> > [2]
> > https://svn.apache.org/repos/asf/openoffice/devtools/bootstrap-
> connector/trunk/
> >
> > [3] https://bz.apache.org/ooo/show_bug.cgi?id=126807
> >
> > __
> >
> > [ ] +1 approve the release
> > [ ] +0
> > [ ] -0
> > [ ] -1 not approve the release
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
> For additional commands, e-mail: dev-h...@openoffice.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

How to work with the gbuild branch in SVN?

[Damjan Jovanovic]

Hi

I am thinking of merging some changes from our gbuild branch
(https://svn.apache.org/repos/asf/openoffice/branches/gbuild) and
wondering how best to do it.

The gbuild branch and trunk have drifted apart, so my preferred
workflow would be to diff specific files and then copy and paste small
changes into trunk, testing on as many platforms as possible, and
committing in many fine-grained commits. This would however lose the
SVN history, and lose the fact those commits even came from that
branch.

Would that be ok? If not, what else should I do?

Thank you
Damjan

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: [DISCUSS] Release Java Bootstrap Connector via Maven

[Carl Marcum]

On 02/15/2016 07:45 PM, Dennis E. Hamilton wrote:

In case it is useful in this case, be aware that it is the last vote cast by 
any individual that matters when you finally count them.

It is not necessary to end the voting if you fall short of the votes you need.  
You can leave the [VOTE] open and see how one can assist in obtaining necessary 
affirmative binding votes.

  - Dennis



Hi Dennis,

Thanks for the input.



-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Re: How to work with the gbuild branch in SVN?

[Pedro Giffuni]

Hi Damjan;

The key lies in "svn merge". You may lose part of the history but
most of it should survive in form of mergeinfo.


A while ago I documented how to work with branches somewhere in
cwiki (based on FreeBSD's svn primer). An executive summary:

- Do a sparse check out of the root AOO tree so you get the
root of the tree but the branches do not spend space in
your harddisk.
- cd to trunk (or the branch) where you will be doing your merging.
- You should have the complete tree "svn up --set-depth=infinity"
for the main tree where you will merge the changes.
- "svn merge" the revision(s) that you need refering to the relative
tree for the branch you are merging. It's probably easier to do
this one by one resolving conflicts as you go.

Example:

(I already did the sparse checkout + the complete checkout of
main in my tree).

% pwd
/home/pfg/aoo/trunk

% ls ../branches
AOO34   alg l10n40  pfg
AOO400  capstone2013ooxml   sidebar
AOO401  gbuild  ooxml-osba  win8build
AOO410  ia2 patch-hsqldb19  writer001

 % svn merge -c r1409397 ../branches/gbuild .
--- Merging r1409397 into '.':
Cmain/svx/Package_inc.mk
Umain/svx/AllLangResTarget_svx.mk
--- Recording mergeinfo for merge of r1409397 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Conflict discovered in file 'main/svx/Package_inc.mk'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
Resolved conflicted state of 'main/svx/Package_inc.mk'
Summary of conflicts:
  Text conflicts: 0 remaining (and 1 already resolved)
..
(fix, merge next type of fun)
___

Hope that helps,

Pedro.

-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org