[gnome-packagekit/glib2-merge-candidate: 7/13] trivial: Fix merge conflicts from master
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-packagekit/glib2-merge-candidate: 7/13] trivial: Fix merge conflicts from master
- Date: Fri, 9 Oct 2009 12:04:50 +0000 (UTC)
commit 67af740e84f47940c0426190f3266a6ded918f34
Merge: b73f629... fd08e4f...
Author: Richard Hughes <richard hughsie com>
Date: Fri Oct 9 08:40:52 2009 +0100
trivial: Fix merge conflicts from master
po/pa.po | 1242 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 646 insertions(+), 596 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
