[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3-l10n, created. libreoffice_3.3.3-1-132-g1265950
The branch, ubuntu-natty-3.3-l10n has been created
at 1265950d336f85916e4bd268aa68955453626307 (commit)
- Shortlog ------------------------------------------------------------
commit 1265950d336f85916e4bd268aa68955453626307
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 5 18:54:44 2011 +0200
fix l10n merge error
commit 6034b989b1dbaf6b1e193a8c0bd7e50a970dccf3
Merge: 03542c8 06a7a99
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 5 18:53:03 2011 +0200
merge 3.3.3-1ubuntu1 l10n branch
commit 03542c80dcda28faa62044e2e37b42f70ce6b39d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Apr 18 16:49:31 2011 +0200
adding unityquicklist.ulf in lp720716.diff
commit 807730d72add032654b4e8c75f53d816cbcef5fe
Merge: cb68012 fcdba47
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Apr 18 12:31:23 2011 +0200
libreoffice-l10n-1:3.3.2-1ubuntu3
commit cb6801247316d2fc9e41144ab96ef7c504e6b9be
Merge: 607b27a ab8a0d6
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 19:04:57 2011 +0100
Merge branch 'ubuntu-natty-3.3.1' into ubuntu-natty-3.3.1-l10n
commit 607b27adc90a953b28109f51d109d3eb469eec2a
Merge: 7de4b2f 24f9282
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 18:45:41 2011 +0100
Merge branch 'ubuntu-natty-3.3.1' into ubuntu-natty-3.3.1-l10n
commit 7de4b2f9535df49fb11a59244a570c92aceb14a5
Merge: 57b2a59 cb7a5f1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 18:16:26 2011 +0100
Merge branch 'ubuntu-natty-3.3.1' into ubuntu-natty-3.3.1-l10n
Conflicts:
changelog
patches/fix-jpeg.diff
commit 57b2a590832dd96d13bce2ef4bdd7994a13b925c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 17:38:11 2011 +0100
fix jpeg lib location
commit 2221bcc52ba32635c8f9e0b8747d921af69b3dd5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 15:03:56 2011 +0100
this is l10n, regenerate control file
commit 42b93c2ff14e30a59a2a15431ca164a1ac213414
Merge: 4702175 b0d389a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 14:38:40 2011 +0100
Merge branch 'ubuntu-natty-3.3.1' into ubuntu-natty-3.3.1-l10n
Conflicts:
changelog
control
commit 4702175582345b6b36415c207a86685ed2686f7c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 8 11:54:07 2011 +0100
libreoffice-l10n_3.3.1-1ubuntu5
commit 803f50f86cf9dfd6426d95f73b28b8bc9122e683
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 2 15:48:14 2011 +0100
libreoffice-l10n 3.3.1-1ubuntu5ppa2
* ppa2 for broken control file on first upload (maverick instead of natty)
-----------------------------------------------------------------------
--
LibreOffice packaging repository
Reply to: