Author: jani
Date: Tue Nov 19 22:59:49 2013
New Revision: 1543621
URL: http://svn.apache.org/r1543621
Log:
update from trunk
Modified:
openoffice/branches/l10n40/ (props changed)
openoffice/branches/l10n40/.gitignore
openoffice/branches/l10n40/extras/l10n/source/da/ (props changed)
openoffice/branches/l10n40/main/connectivity/prj/ (props changed)
openoffice/branches/l10n40/main/sal/ (props changed)
openoffice/branches/l10n40/main/stlport/ (props changed)
openoffice/branches/l10n40/main/xmlsecurity/prj/ (props changed)
openoffice/branches/l10n40/test/ (props changed)
openoffice/branches/l10n40/test/testcommon/source/org/openoffice/test/vcl/
(props changed)
Propchange: openoffice/branches/l10n40/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1538343-1543608
Merged /openoffice/branches/ia2:r1417739-1541842
Modified: openoffice/branches/l10n40/.gitignore
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n40/.gitignore?rev=1543621&r1=1543620&r2=1543621&view=diff
==============================================================================
--- openoffice/branches/l10n40/.gitignore (original)
+++ openoffice/branches/l10n40/.gitignore Tue Nov 19 22:59:49 2013
@@ -57,7 +57,6 @@ TAGS
# externals
/main/external/unowinreg/unowinreg.dll
/main/external/msvcp90/*
-/main/moz/zipped/*
# $INPATH output directories
/*/*/unxlng??
Propchange: openoffice/branches/l10n40/extras/l10n/source/da/
------------------------------------------------------------------------------
Merged /openoffice/trunk/extras/l10n/source/da:r1543565-1543608
Propchange: openoffice/branches/l10n40/main/connectivity/prj/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/connectivity/prj:r1543590-1543608
Propchange: openoffice/branches/l10n40/main/sal/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/sal:r1543565-1543608
Propchange: openoffice/branches/l10n40/main/stlport/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/stlport:r1543578-1543608
Propchange: openoffice/branches/l10n40/main/xmlsecurity/prj/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/xmlsecurity/prj:r1543583-1543608
Propchange: openoffice/branches/l10n40/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1543565-1543608
Propchange:
openoffice/branches/l10n40/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged
/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1543565-1543608
