glom r1292 - in branches/glom-1-6: . glom glom/libglom glom/libglom/data_structure glom/libglom/document glom/libglom/python_embed glom/mode_data glom/mode_find glom/navigation glom/reports glom/utility_widgets glom/utility_widgets/adddel

[arminb svn gnome org]

Author: arminb
Date: 2007-11-16 19:57:15 +0000 (Fri, 16 Nov 2007)
New Revision: 1292
ViewCVS link: http://svn.gnome.org/viewcvs/glom?rev=1292&view=rev

Modified:
   branches/glom-1-6/ChangeLog
   branches/glom-1-6/config.h.in
   branches/glom-1-6/configure.in
   branches/glom-1-6/glom/Makefile.am
   branches/glom-1-6/glom/application.cc
   branches/glom-1-6/glom/application.h
   branches/glom-1-6/glom/base_db.cc
   branches/glom-1-6/glom/base_db.h
   branches/glom-1-6/glom/box_db_table.cc
   branches/glom-1-6/glom/combobox_fields.cc
   branches/glom-1-6/glom/combobox_relationship.cc
   branches/glom-1-6/glom/dialog_connection.cc
   branches/glom-1-6/glom/dialog_connection.h
   branches/glom-1-6/glom/dialog_invalid_data.cc
   branches/glom-1-6/glom/filechooser_export.cc
   branches/glom-1-6/glom/frame_glom.cc
   branches/glom-1-6/glom/frame_glom.h
   branches/glom-1-6/glom/glom.glade
   branches/glom-1-6/glom/libglom/Makefile.am
   branches/glom-1-6/glom/libglom/connectionpool.cc
   branches/glom-1-6/glom/libglom/connectionpool.h
   branches/glom-1-6/glom/libglom/data_structure/fieldtypes.cc
   branches/glom-1-6/glom/libglom/data_structure/glomconversions.cc
   branches/glom-1-6/glom/libglom/document/document_glom.cc
   branches/glom-1-6/glom/libglom/document/document_glom.h
   branches/glom-1-6/glom/libglom/python_embed/py_glom_relatedrecord.cc
   branches/glom-1-6/glom/libglom/spawn_with_feedback.cc
   branches/glom-1-6/glom/libglom/utils.cc
   branches/glom-1-6/glom/main.cc
   branches/glom-1-6/glom/mode_data/Makefile.am
   branches/glom-1-6/glom/mode_data/box_data.cc
   branches/glom-1-6/glom/mode_data/box_data.h
   branches/glom-1-6/glom/mode_data/box_data_details.cc
   branches/glom-1-6/glom/mode_data/box_data_details.h
   branches/glom-1-6/glom/mode_data/box_data_list.cc
   branches/glom-1-6/glom/mode_data/box_data_list.h
   branches/glom-1-6/glom/mode_data/box_data_list_related.cc
   branches/glom-1-6/glom/mode_data/box_data_list_related.h
   branches/glom-1-6/glom/mode_data/dialog_layout_export.cc
   branches/glom-1-6/glom/mode_data/notebook_data.cc
   branches/glom-1-6/glom/mode_data/notebook_data.h
   branches/glom-1-6/glom/mode_find/box_data_details_find.cc
   branches/glom-1-6/glom/mode_find/box_data_list_find.cc
   branches/glom-1-6/glom/navigation/box_tables.cc
   branches/glom-1-6/glom/notebook_glom.cc
   branches/glom-1-6/glom/reports/Makefile.am
   branches/glom-1-6/glom/utility_widgets/adddel/adddel.cc
   branches/glom-1-6/glom/utility_widgets/buttonglom.cc
   branches/glom-1-6/glom/utility_widgets/cellrendererlist.cc
   branches/glom-1-6/glom/utility_widgets/comboentryglom.cc
   branches/glom-1-6/glom/utility_widgets/comboentryglom.h
   branches/glom-1-6/glom/utility_widgets/comboglom.cc
   branches/glom-1-6/glom/utility_widgets/comboglom.h
   branches/glom-1-6/glom/utility_widgets/entryglom.cc
   branches/glom-1-6/glom/utility_widgets/entryglom.h
   branches/glom-1-6/glom/utility_widgets/filechooserdialog.cc
   branches/glom-1-6/glom/utility_widgets/filechooserdialog.h
   branches/glom-1-6/glom/utility_widgets/flowtable.cc
   branches/glom-1-6/glom/utility_widgets/flowtable.h
   branches/glom-1-6/glom/utility_widgets/flowtablewithfields.cc
   branches/glom-1-6/glom/utility_widgets/imageglom.cc
   branches/glom-1-6/glom/utility_widgets/imageglom.h
   branches/glom-1-6/glom/utility_widgets/labelglom.cc
   branches/glom-1-6/glom/utility_widgets/layoutwidgetbase.cc
   branches/glom-1-6/glom/utility_widgets/layoutwidgetbase.h
   branches/glom-1-6/glom/utility_widgets/notebookglom.cc
   branches/glom-1-6/glom/utility_widgets/textviewglom.cc
   branches/glom-1-6/glom/utility_widgets/textviewglom.h
   branches/glom-1-6/glom/xsl_utils.cc
Log:
2007-11-16  Armin Burgmeier  <armin openismus com>

	* several files: Redid the merge I already wanted to do 10 days ago.
	Something went wrong and not all files have been merged.