[gnac/devel: 2/2] Merge branch 'file-chooser' into devel

From: David Joaquim <djoaquim src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnac/devel: 2/2] Merge branch 'file-chooser' into devel
Date: Wed, 9 Jun 2010 19:43:08 +0000 (UTC)

commit 599987c41ffefd5cf81f079534226c28d1d770fc
Merge: 392ec06 aa0cf78
Author: David Joaquim <djoaquim src gnome org>
Date:   Wed Jun 9 21:39:19 2010 +0200

    Merge branch 'file-chooser' into devel
    
    Conflicts:
    	src/gnac-main.c

 data/ui/gnac.xml |  105 ++++++++++++++
 src/gnac-main.c  |  304 ++--------------------------------------
 src/gnac-main.h  |    5 -
 src/gnac-ui.c    |  411 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/gnac-ui.h    |   30 ++++
 5 files changed, 555 insertions(+), 300 deletions(-)
---

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