[pan2: 35/68] Merge branch 'mem' into int2
- From: Petr Kovář <pmkovar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2: 35/68] Merge branch 'mem' into int2
- Date: Tue, 8 Feb 2011 23:00:58 +0000 (UTC)
commit f5168c8abd930eab9c88b4785c7ff68292884962
Merge: cbbb517 514c3d3
Author: K. Haley <haleykd users sf net>
Date: Mon Aug 2 14:47:58 2010 -0600
Merge branch 'mem' into int2
pan/data-impl/Makefile.am | 3 +-
pan/data-impl/data-impl.h | 7 ++-
pan/data-impl/memchunk.h | 111 +++++++++++++++++++++++++++++++++++++++++++++
pan/data-impl/my-tree.cc | 5 +-
pan/data/article.h | 8 ++--
pan/data/parts.cc | 58 +++++++++---------------
pan/data/parts.h | 18 ++++----
7 files changed, 154 insertions(+), 56 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]