[anjuta/sdb-core-trans: 12/14] Merge branch 'master' into sdb-core-trans
- From: Massimo Cora' <mcora src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/sdb-core-trans: 12/14] Merge branch 'master' into sdb-core-trans
- Date: Sun, 20 Jun 2010 17:12:39 +0000 (UTC)
commit 300ba6b2b27f7d66e9ec7e32f9b1669301f19048
Merge: ebc6167 a565c5f
Author: Massimo Corà <mcora src gnome org>
Date: Sun Jun 20 12:04:25 2010 +0200
Merge branch 'master' into sdb-core-trans
Conflicts:
plugins/symbol-db/symbol-db-query-result.c
plugins/symbol-db/symbol-db-query-result.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
