[glom/sqlbuilder: 3/3] Merge branch 'master' into sqlbuilder
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom/sqlbuilder: 3/3] Merge branch 'master' into sqlbuilder
- Date: Sat, 24 Oct 2009 20:00:37 +0000 (UTC)
commit 4ecb20bcd3815ad510c3ecace3b625bda1df8135
Merge: 6f8c18b... a1ceaa3...
Author: Murray Cumming <murrayc murrayc com>
Date: Sat Oct 24 22:00:17 2009 +0200
Merge branch 'master' into sqlbuilder
ChangeLog | 37 +++++++
Makefile_libglom.am | 3 +
glom/application.cc | 2 +
glom/dialog_existing_or_new.cc | 2 +
glom/libglom/connectionpool.cc | 109 --------------------
glom/libglom/connectionpool.h | 4 +-
glom/libglom/spawn_with_feedback.cc | 1 +
glom/main.cc | 109 ++++++++++++++++++++
.../print_layouts/print_layout_toolbar_button.cc | 4 +-
glom/utility_widgets/layouttoolbar.cc | 4 +-
glom/utility_widgets/layouttoolbarbutton.cc | 4 +-
glom/xsl_utils.cc | 4 +-
macros/mm-python.m4 | 7 +-
win32/build-installer | 62 ++++++------
win32/glom.iss.in | 34 +++---
15 files changed, 219 insertions(+), 167 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]