[glibmm/vector: 7/7] Merge branch 'master' into vector

From: Krzesimir Nowak <krnowak src gnome org>
To: commits-list gnome org
Cc:
Subject: [glibmm/vector: 7/7] Merge branch 'master' into vector
Date: Thu, 3 Feb 2011 22:23:08 +0000 (UTC)

commit 7f30a826e89fed9417c61f23d585a0898ffb4754
Merge: 641c702 f4d6bc2
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Thu Feb 3 23:21:46 2011 +0100

    Merge branch 'master' into vector
    
    Conflicts:
    	glib/glibmm/arrayhandle.h
    	glib/glibmm/listhandle.h
    	glib/glibmm/slisthandle.h

 ChangeLog                 |   40 ++++++++
 NEWS                      |   16 ++++
 configure.ac              |    4 +-
 glib/glibmm/vectorutils.h |  217 +++++++++++++++++++++++++++++++++++++++++---
 tools/pm/Output.pm        |   75 +++++++++-------
 tools/pm/WrapParser.pm    |   53 +++++++----
 6 files changed, 336 insertions(+), 69 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]