www-legal-discuss mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmcdon...@apache.org
Subject svn commit: r1673388 - in /infrastructure/site/trunk/content: legal/ licenses/ licenses/exports/ licenses/proposed/
Date Tue, 14 Apr 2015 08:38:56 GMT
Author: gmcdonald
Date: Tue Apr 14 08:38:54 2015
New Revision: 1673388

URL: http://svn.apache.org/r1673388
Log:
merge sallys branch back to trunk. There were 17 conflicts of images mainly to resolve, hopefully
this is correct

Modified:
    infrastructure/site/trunk/content/legal/3party.mdtext   (props changed)
    infrastructure/site/trunk/content/legal/index.mdtext   (props changed)
    infrastructure/site/trunk/content/legal/ramblings.mdtext   (props changed)
    infrastructure/site/trunk/content/legal/reports.mdtext   (props changed)
    infrastructure/site/trunk/content/legal/resolved.mdtext   (props changed)
    infrastructure/site/trunk/content/legal/src-headers.mdtext   (props changed)
    infrastructure/site/trunk/content/licenses/GPL-compatibility.mdtext   (props changed)
    infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext   (props changed)
    infrastructure/site/trunk/content/licenses/exports/index.html   (props changed)
    infrastructure/site/trunk/content/licenses/index.mdtext   (props changed)
    infrastructure/site/trunk/content/licenses/proposed/index.mdtext   (props changed)

Propchange: infrastructure/site/trunk/content/legal/3party.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/legal/index.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/legal/ramblings.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/legal/reports.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/legal/resolved.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/legal/src-headers.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/licenses/GPL-compatibility.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/licenses/exports/index.html
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/licenses/index.mdtext
            ('svn:mergeinfo' removed)

Propchange: infrastructure/site/trunk/content/licenses/proposed/index.mdtext
            ('svn:mergeinfo' removed)



---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org


Mime
View raw message