[gnome-packagekit/polkit1: 92/92] Fix conflicts
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-packagekit/polkit1: 92/92] Fix conflicts
- Date: Tue, 16 Jun 2009 06:21:31 -0400 (EDT)
commit 4d39a938cdb6b24a0a316a58228aeff923aef3aa
Merge: 4f168d8... 63b6116...
Author: Richard Hughes <richard hughsie com>
Date: Tue Jun 16 11:18:53 2009 +0100
Fix conflicts
po/kn.po | 3884 +++++++++++++++++++++++-------------------------
po/mr.po | 1174 ++++++++++-----
src/Makefile.am | 2 +
src/gpk-auto-refresh.c | 80 +-
src/gpk-common.c | 42 -
src/gpk-common.h | 1 -
src/gpk-session.c | 502 +++++++
src/gpk-session.h | 77 +
src/gpk-watch.c | 10 +-
9 files changed, 3248 insertions(+), 2524 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]