summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2011-04-06 12:47:18 +0200
committerVo Minh Thu <vmt@openerp.com>2011-04-06 12:47:18 +0200
commita0c1363fd68a0c31d5b6cfe0cf11cf3e7ca9ce33 (patch)
tree5b96c18373c6e27c017a2f4fc808654aa959368f /debian
parenta78522a42a28bcaf787b60315e588ce19f122d96 (diff)
parent86bc2a6451db51be840a5f8744be2ddc18a9e681 (diff)
[MERGE] merged 6.0.
bzr revid: vmt@openerp.com-20110406104718-cdcyq74rltf102sa
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/po/sq.po2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index efa324f6a2e..f9a2355cf62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openerp-server (6.0.2-1) testing; urgency=low
+
+ * Using upstream version 6.0.2
+
+ -- Vo Minh Thu <vmt@openerp.com> Tue, 05 Apr 2011 12:31:00 +0100
+
openerp-server (6.0.1-1) unstable; urgency=low
* Translations from Rosetta (only zh_CN today)
diff --git a/debian/po/sq.po b/debian/po/sq.po
index fd67eb80f3b..5383cb02030 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-31 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-03-29 06:20+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. Type: string