]> git.sur5r.net Git - glabels/blobdiff - ChangeLog
Imported Upstream version 3.0.0
[glabels] / ChangeLog
index 6aff45b1d0d2d0870d3aa79b3d1e5769db085a4d..a78e471bb517f138c9399ae1b644a6f12217f178 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-commit 735fbf968d761acb31bee98121686f02cdeab17e
+commit d01a448a3e9c0719a2adfb6d51591e78148cfee3
 Author: Jim Evins <evins@snaught.com>
-Date:   2010-04-19
+Date:   2011-05-16
 
-    Preparation for 2.2.8
+    Even more preparation for 3.0.0 release.
+
+M      README
+M      configure.ac
+
+commit 12e55e8a835df758b00cdf65532978b6bd508ee7
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-05-16
+
+    More preparation for 3.0 release
 
 M      NEWS
-M      configure.in
+M      libglabels/lgl-xml.h
+M      templates/Makefile.am
+M      templates/ascom-iso-templates.xml
+M      templates/databecker-iso-templates.xml
+M      templates/dataline-iso-templates.xml
+M      templates/geha-iso-templates.xml
+R099   templates/glabels-2.3.dtd       templates/glabels-3.0.dtd
+M      templates/hama-iso-templates.xml
+M      templates/jac-iso-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/pearl-iso-templates.xml
+
+commit 4c07f4f573f171a64bbe7119d3c97a043123f8b6
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-05-15
 
-commit e68a37d0bec952928393abea94326a7ec77b9e38
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-04-11
+    Preparation for 3.0 release.
+
+D      MESSAGE-OF-DOOM
+M      Makefile.am
+M      configure.ac
+
+commit 29073d4b56183bcb43dc859d17e7c079482e5a63
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2011-05-05
+
+    Updated French translation
+
+M      po/fr.po
+
+commit 6a47b5cdab899590651b0abda7ad34e9f3bcd3e5
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-04-29
 
     Updated Spanish translation
 
 M      po/es.po
 
-commit a17439be4a34d934f0bf4a19dc9bfb2967343b32
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-04-11
+commit ff1569ac39ceb866ead6394033376eff6d2bf940
+Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
+Date:  2011-04-25
 
-    Remove wasted space in "new label dialog"
+    Updated Japanese translation
 
-    Modified the layout spacing of widgets in the "new label dialog."
-    This makes
-    the dialog a little more compact and hopefully fits better on
-    small screens
-    such as netbooks.
+M      po/ja.po
 
-M      data/glade/new-label-dialog.glade
-M      data/glade/wdgt-media-select.glade
-M      data/glade/wdgt-rotate-label.glade
-M      src/new-label-dialog.c
+commit 186d2516639549c56cb1f513932f23e08eb769bf
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-commit 333e792ab9daa4cb6fba8f19d360ca27d69ebff0
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-04-11
+    Updated Czech screenshot
 
-    Add place-holder field to all empty private structures
+M      help/cs/figures/merge-ex2-1.png
 
-    Fixes glabels bug #2981895.  This is a work-around for glib bug
-    #615379.  For
-    objects with no private data, add a place-holder field so that
-    the private
-    structure is not of zero length which causes g_new0() to crash in glib
-    2.24.0.
+commit 63747f9f9684a54cdff32474b8a228d3ab9d1d71
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-M      src/view-barcode.c
-M      src/view-box.c
-M      src/view-ellipse.c
-M      src/view-image.c
-M      src/view-line.c
-M      src/view-text.c
+    Updated Czech screenshot
 
-commit a3275186debbf0f4addf574bf02b789bcf3776ba
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-04-07
+M      help/cs/figures/merge-ex1-1.png
 
-    Updated Spanish translation
+commit 3307da9d369704bae244d9501975b6f90caec6c9
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-M      po/es.po
+    Updated Czech screenshot
 
-commit be60f3c5d947d9ae66ec16f5b61045deb76d1b59
-Author: Filipe Roque <fliproque@gmail.com>
-Date:  2010-04-04
+M      help/cs/figures/merge-ex3-1.png
 
-    Updated Portuguese translation
+commit 76ac17d3725ac4ed80e76b9c1e199ac5af80f146
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-M      po/LINGUAS
-A      po/pt.po
+    Updated Czech screenshot
 
-commit a26ba4f2eb55cc02f08c1b97fd4c001d3a550fd2
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-04-03
+M      help/cs/figures/merge-ex3-1.png
 
-    Added Avery DL33 and look-alike templates.
+commit 1e5f1c5c5ecb5733dbfa29a9c81c68613c753c5a
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    DL33 templates provided by Ian Shuttleworth.
+    Czech screenshot
 
-M      AUTHORS
-M      data/templates/avery-iso-templates.xml
-M      data/templates/misc-iso-templates.xml
+A      help/cs/figures/merge-ex3-1.png
 
-commit 675d5a6a13117ca85ebdc292dd931efece55d406
+commit b5f72ac136910eaa830b777a126c097595183df2
 Author: Marek Černocký <marek@manet.cz>
-Date:  2010-03-28
+Date:  2011-04-22
 
-    Update Czech translation
+    Updated Czech translation
 
 M      po/cs.po
 
-commit ad36a71e24d395d641bf495dda96b8dea994d2df
-Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
-Date:  2010-03-28
+commit 43b1ee240a0eefdc0c30391d21bf0bf15fca0891
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Updated Slovenian translation
+    Updated Czech screenshot
 
-M      po/sl.po
+M      help/cs/figures/object-editor-sidebar.png
 
-commit 67becb0c44760f68ad5c014866a53707e8ef4630
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-03-21
+commit 986b010c2b29f4937ed0fa5bc4eb61704c8ac9e1
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Updated Spanish translation
+    Updated Czech screenshot
 
-M      po/es.po
+M      help/cs/figures/object-editor-sidebar.png
 
-commit 1dd629c4b88056fd0ae51ce9c1b2b0921286fb98
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-03-20
+commit 677a726bcd9c8bcd55e573c35ba288c63c521598
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Updated German translation
+    Updated Czech screenshot
 
-M      po/de.po
+M      help/cs/figures/skip-fields-screenshot.png
 
-commit bf78adcbbfd7e8fa51308e0fd64c22d6b07754bc
-Author: Bruno Brouard <annoa.b@gmail.com>
-Date:  2010-03-17
+commit 1e9b39dad778cd4ebfac00372bd54f46e973ec09
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Updated French translation
+    Updated Czech screenshot
 
-M      po/fr.po
+M      help/cs/figures/skip-fields-screenshot.png
 
-commit 6414ee7cd3975db6e7a7fe65b51ec7918ddcd7d6
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-03-17
+commit 15b8149e3d0c08e32554c2fe20a78eb53774cde6
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Updated Spanish translation
+    Updated Czech screenshot
 
-M      po/es.po
+M      help/cs/figures/print-merge.png
 
-commit 21ce5c207013d6ee8f28aa02b4db5894422b8942
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-03-16
+commit 6ca652b51d095de7e0eaa92bfeee0f230c3d1dca
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Catching up on template submissions.
+    Updated Czech screenshot
 
-M      AUTHORS
-M      data/templates/misc-iso-templates.xml
-M      data/templates/misc-us-templates.xml
-M      data/templates/pearl-templates.xml
+M      help/cs/figures/print-copies.png
 
-commit 1a7125903c076189372671b3b1c699bd1a4322c6
-Author: Kjartan Maraas <kmaraas@gnome.org>
-Date:  2010-03-15
+commit 91557a5e46e0ce14b5365212d9280d9e258141b5
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Add Norwegian language entry.
+    Unused Czech screenshot
 
-M      po/LINGUAS
+D      help/cs/figures/main-window-empty.png
 
-commit 501e409e1565d6aaf75fd6125eca323b4fe081f0
-Author: Kjartan Maraas <kmaraas@gnome.org>
-Date:  2010-03-15
+commit 47891355ecebefb5ae826a2a3f0dfba3a1386e63
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-22
 
-    Added Norwegian bokmål translation
+    Czech screenshot
 
-A      po/nb.po
+A      help/cs/figures/skip-fields-screenshot.png
 
-commit 99ac6500e2ce897708ac228b4684d3608576b931
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-03-07
+commit 500279e89312f9ae2090a89a3feb24fc35b84c10
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-21
 
-    Updated Spanish translation
+    Czech screenshot
 
-M      po/es.po
+A      help/cs/figures/skip-fields-output.png
 
-commit c53c6d83333de1ab2d77f1e81e1d151509f7a1d4
-Author: Takeshi AIHANA <takeshi.aihana@gmail.com>
-Date:  2010-03-06
+commit 22acea090ca313b616ebb0c90fcf5846d3885447
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-21
 
-    Updated Japanese translation
+    Updated Czech translation
 
-M      po/ja.po
+M      help/cs/cs.po
 
-commit c142345372faa68185cd5bbeba4e6192d72599ce
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-03-02
+commit e17dffc422199abd882d4448a4d8fe5672989636
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-19
 
-    Preparation for 2.2.7
+    Updated Czech translation
 
-    Updated NEWS.  Updated version information in configure.in.
-    Added pearl
-    templates to makefile.
+M      help/cs/cs.po
 
-M      NEWS
-M      configure.in
-M      data/templates/Makefile.am
-D      help/glabels-help.pot
+commit bf73db190505f297c640bb76ccdde3895f613681
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-18
+
+    Updated Czech translation
+
+M      po/cs.po
 
-commit c866fbe3c5dd5cdea13efad8107a7d1a82b5a172
+commit edc606015a0252f66a57c332dd6524c48e2653d4
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-03-02
+Date:  2011-04-17
 
-    Fixed some bugs in template data
+    [l10n] Updated German translation
 
-M      data/templates/pearl-templates.xml
+M      po/de.po
 
-commit ca13ecdc3455f0cca218671dfc9c0a31500a264a
-Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
-Date:  2010-02-28
+commit ec58a44af91d79d9be9fe63f7814327602ba5cd7
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-04-17
 
-    Updated Slovenian translation
+    Updated Czech translation
 
-M      po/sl.po
+M      po/cs.po
 
-commit 7dbee475634553b69ce7dd934608c7a35da59aa2
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-27
+commit 6141161e4a031f6b15de83379f6f690096eaa524
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-04-16
 
-    Added Staples STAP14 Mailing Labels
+    Reorganization of object alignment menus
 
-M      data/templates/misc-iso-templates.xml
+    Object alignment menus have been reorganized and menu items renamed to
+    remove any ambiguity as to what horizontal versus vertical alignment
+    mean.  The new labels and organization attempt to be consistent with
+    other graphic applications.
 
-commit e3cb29b2d6c93547112146696b8adb0c35387b6e
-Author: Joe Hansen <joedalton2@yahoo.dk>
-Date:  2010-02-23
+M      src/ui.c
 
-    Updated Danish translation
+commit 51b590ea08683c08ab39366970c140b1fc6f5eef
+Author: Takayoshi OKANO <kano@na.rim.or.jp>
+Date:  2011-04-14
 
-A      po/da.po
+    Updated Japanese translation
 
-commit de137c4bcf7eb19551ce1478f9929891781ef86f
-Author: Kenneth Nielsen <k.nielsen81@gmail.com>
-Date:  2010-02-23
+M      po/ja.po
 
-    Added da to list of languages
+commit 64d6190bf896630e8c1cafb61bd6132b3e453592
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-04-03
 
-M      po/LINGUAS
+    Updated Spanish translation
 
-commit aa892ac85b64ba0f069cc8d0e178faef4eb3de05
-Author: Marek Černocký <marek@manet.cz>
-Date:  2010-02-21
+M      help/es/es.po
+
+commit 68d10df024493df3045b4a5ebbd88f76ddbb6f45
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-03-03
 
-    Update Czech translation
+    Some corrections to the newest Kores template
 
-M      help/cs/cs.po
+M      templates/misc-iso-templates.xml
+M      templates/vendors.xml
 
-commit 4cf933c8d8e1f74e61fac64b3cfd954c51029b4b
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-02-19
+commit ae2c5aa93dcdc9f93de163c6d598373062b15669
+Author: Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>
+Date:  2011-03-03
 
-    Added initial Spanish translation
+    Added Korres template
 
-A      help/es/es.po
+M      AUTHORS
+M      templates/misc-iso-templates.xml
 
-commit 31cb90be5f9219e04e06f33c72e4269c03154873
-Author: Jorge González <jorgegonz@svn.gnome.org>
-Date:  2010-02-19
+commit 67785b3fe46e285c80b5c312aedcda7daff29192
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-27
 
-    Added es to DOC_LINGUAS
+    Updated Spanish translation
 
-M      help/Makefile.am
+M      help/es/es.po
 
-commit ca216db75311bda7b80e08409b33212729d8a8ff
-Author: Petr Kovar <pknbe@volny.cz>
-Date:  2010-02-18
+commit 66d2aa8ed705bbb573571e8ea16328cfbae56731
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-02-26
 
-    Fix Czech translation by Marek Cernocky
+    Don't require windowing system for glabels-batch.
 
-M      po/cs.po
+    Use gtk_init_check() instead of gtk_init() to initialize GTK.
 
-commit 59ce2a62e8ff923d6348f84b9e3e0cff59b10e87
-Author: Petr Kovar <pknbe@volny.cz>
-Date:  2010-02-18
+M      src/glabels-batch.c
 
-    Add Czech help translation by Marek Cernocky
+commit 7e55002270dda25fc70c379be19396f449d5aa89
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-22
 
-M      help/Makefile.am
-A      help/cs/cs.po
-A      help/cs/figures/main-window-empty.png
-A      help/cs/figures/merge-ex1-1.png
-A      help/cs/figures/merge-ex1-2.png
-A      help/cs/figures/merge-ex1-3.png
-A      help/cs/figures/merge-ex1-4.png
-A      help/cs/figures/merge-ex2-1.png
-A      help/cs/figures/merge-ex2-2.png
-A      help/cs/figures/merge-ex2-3.png
-A      help/cs/figures/merge-ex2-4.png
-A      help/cs/figures/object-editor-sidebar.png
-A      help/cs/figures/print-copies.png
-A      help/cs/figures/print-merge.png
+    Updated Spanish translation
+
+M      help/es/es.po
 
-commit f428dd10c86b1102e96fe76ff0c62d209d6c2923
+commit bd3208b5cac24a8d6f231a72ed45bb0e73d1bb6e
 Author: Jim Evins <evins@snaught.com>
-Date:  2010-02-15
+Date:  2011-02-21
 
-    Create a default frame if missing from template file
+    Modified CSV parser.
 
-    When parsing a template node, if there is no recognized frame node
-    (e.g.
-    Label-rectangle), a default full-page frame with a 1x1 layout
-    is created.
-    This prevents potential crashes if sharing a user '.glabels' directory
-    with future versions of glabels with new frame types, or in the
-    case of
-    typos for hand generated templates.
+    Modified CSV parser to more closely follow the format outlined in
+    RFC 4180.
+    The primary difference is that quoted text cannot be embedded in
+    the middle
+    of a field.  I.e. the quotes (") should envelope the entire field.
+    Legacy
+    "escape" rules still apply.
 
-M      libglabels/xml-template.c
+M      src/merge-text.c
 
-commit 8ce4aff951c126566870d3417aeadcf385ca5886
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-13
+commit 61a7ec1126f33c26dcb57fb3423df70df32b8e71
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-20
 
-    Added URL for Geha Z53 again
+    Updated Spanish translation
 
-M      data/templates/misc-iso-templates.xml
+M      help/es/es.po
 
-commit c990e078f09bfa3bcee172459e883c1231b458b6
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-13
+commit 92192b1e5c37f4a0d2bdf363d80d0c380c4b56a4
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-20
 
-    Removed URL from template due to gettext errors
+    Updated Spanish translation
 
-M      data/templates/misc-iso-templates.xml
+M      po/es.po
 
-commit 610cdbbecd84ed54b2aa082c2781be2f0aae3289
+commit 7dd57e55560e8132dd9d251c640061bbfc235c32
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-13
+Date:  2011-02-14
 
-    Added PEARL templates
+    Added Avery template
 
 M      AUTHORS
-A      data/templates/pearl-templates.xml
+M      templates/avery-iso-templates.xml
 
-commit 921c7bc0ab840288787d50ffdde15065f5a610ee
+commit d1ccf52d5d0ebdd533ad0692e5e375ee90444b63
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-13
+Date:  2011-02-12
 
-    Added Geha Z53 template
+    Added Merax template
 
 M      AUTHORS
-M      data/templates/misc-iso-templates.xml
-
-commit 548abc9542516724ee8029c7186280cb171b085c
-Author: Petr Kovar <pknbe@volny.cz>
-Date:  2010-02-11
+M      templates/misc-other-templates.xml
+M      templates/vendors.xml
 
-    Update Czech translation by Marek Cernocky
+commit f9dd2935eefff13bbdcff719801feca62aa8c95a
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-07
 
-M      po/cs.po
+    Updated Spanish translation
 
-commit a309766e4e90d164e487ebc1978f92fbedbb536c
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-09
+M      help/es/es.po
 
-    Updated German translation
+commit 240cc08cb6b9a9350ea358fb4828f32a5001c16a
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-06
 
-M      po/de.po
+    Updated Spanish translation
 
-commit 6ac473f54bf654ebed0e3eaf94769130b74edd1a
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-02-09
+M      po/es.po
 
-    Updated German translation
+commit d0ec06d8c6f4ec8c3fa26fa946991aa5e904d162
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-02-05
 
-M      po/de.po
+    Updated Spanish translation
 
-commit 01b54d65f1bc32538314f01cbe89d89b2d0baa77
-Author: Jim Evins <evins@snaught.com>
-Date:  2010-02-06
+M      help/es/es.po
 
-    Relax libxml limits when parsing label files
+commit 8481ea582aa78a7973d8199062cb3737ad75b07e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-02-03
 
-    Glabels bug #2940758.  Back port from master:  Use XML_PARSE_HUGE
-    parser option
-    so that we can handle large text nodes, such as encoded images.  This
-    modification is only applied if libxml 2.7+ is available, as to
-    not introduce
-    new dependencies.
+    [l10n] Added nl to DOC_LINGUAS
 
-M      configure.in
-M      src/Makefile.am
-M      src/xml-label.c
+M      help/Makefile.am
 
-commit 78329ea6424b52a3e8236b69afebc2eddc6386db
+commit f8d673a02c64aaffd27304d7b3a50cc26bf55754
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2010-01-16
+Date:  2011-02-03
 
-    Updated German doc translation
+    [l10n] Added initial Dutch doc translation to prevent translating
+    actually untranslatable strings
 
-M      help/de/de.po
+A      help/nl/nl.po
 
-commit 8bc29ac0910c02eba94f9ccd5042c07cb415b7f3
-Author: Petr Kovar <pknbe@volny.cz>
-Date:  2010-01-13
+commit 3840d11039df4c6834a4675d7e0a5b6a47ec5d7e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-02-03
 
-    Updated Czech translation by Marek Cernocky
+    [l10n] Updated Dutch translation
 
-M      po/cs.po
+M      po/nl.po
 
-commit e5ecd2b4e597bf2e509d4c285f59420322dad390
-Author: Claude Paroz <claude@2xlibre.net>
-Date:  2010-01-09
+commit 3943dd1240c9a6ef449fccfd52e7302baf9c5ae4
+Author: Bruno Brouard <annoa.b@gmail.com>
+Date:  2011-02-02
 
-    Add fr to DOC_LINGUAS variable
+    Updated French doc translation
 
-M      help/Makefile.am
+M      help/fr/fr.po
 
-commit a4758401a939c804a3a026f5c5bcf2deb1f8f7c1
-Author: Claude Paroz <claude@2xlibre.net>
-Date:  2010-01-09
+commit 124cff7d1682058043276ce0ee4845010e25b43a
+Author: Bruno Brouard <annoa.b@gmail.com>
+Date:  2011-02-02
+
+    Updated French Doc Translation
+
+    Gérard Baylard and Bruno Brouard
+
+D      help/fr/figures/main-window-empty.png
+D      help/fr/figures/merge-ex1-1.png
+D      help/fr/figures/merge-ex1-2.png
+D      help/fr/figures/merge-ex1-3.png
+D      help/fr/figures/merge-ex1-4.png
+D      help/fr/figures/merge-ex2-1.png
+D      help/fr/figures/merge-ex2-2.png
+D      help/fr/figures/merge-ex2-3.png
+D      help/fr/figures/merge-ex2-4.png
+D      help/fr/figures/object-editor-sidebar.png
+D      help/fr/figures/print-copies.png
+D      help/fr/figures/print-merge.png
+M      help/fr/fr.po
+
+commit 0bd38baa90a0f44b58d90bb4c02abd73b84f0f51
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-01-29
 
-    Add French translation of manual
+    [l10n] Updated German translation
 
-    Contributed by Alain Lojewski and Claude Paroz
+M      po/de.po
 
-A      help/fr/figures/main-window-empty.png
-A      help/fr/figures/merge-ex1-1.png
-A      help/fr/figures/merge-ex1-2.png
-A      help/fr/figures/merge-ex1-3.png
-A      help/fr/figures/merge-ex1-4.png
-A      help/fr/figures/merge-ex2-1.png
-A      help/fr/figures/merge-ex2-2.png
-A      help/fr/figures/merge-ex2-3.png
-A      help/fr/figures/merge-ex2-4.png
-A      help/fr/figures/object-editor-sidebar.png
-A      help/fr/figures/print-copies.png
-A      help/fr/figures/print-merge.png
-A      help/fr/fr.po
+commit ddbff2b17acd43e4e9c67a40158c4d884a8d611e
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-01-29
 
-commit 908f97ce93793c1ad05e15b1ad9c788dab587a17
-Author: Matej Urbančič <mateju@svn.gnome.org>
-Date:  2009-12-17
+    Updated Czech translation
 
-    Added sl for Slovenian translation
+M      po/cs.po
 
-M      po/LINGUAS
+commit 94e5539014882d3974c84eef6b2fa13acf60dbe1
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-27
 
-commit b0e6dea0d9c9b2ca0e1e1ba0650cbe990bce1c29
-Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
-Date:  2009-12-17
+    Updated Spanish translation
 
-    Updated Slovenian translation
+M      help/es/es.po
 
-A      po/sl.po
+commit 63cb045c9cc3abbe2af6a62166b891a417ce17f8
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-27
 
-commit 8f4713e9aec5e19ad382d6493119f6cea812ced4
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-18
+    Updated Spanish translation
 
-    Fixed focus behavior of view canvas
+M      po/es.po
 
-    Fixes bug #2899305.  Don't just automatically steal focus when
-    entering
-    canvas.  Require a click to get focus back.
+commit c839157ab3638b4935a8a4021855515d83b07f2b
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-01-26
 
-M      src/view.c
+    Added acknowledgement for template submission
 
-commit 1f24fba0eafc5f5e13c4e27cc315ac13cd450bbc
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-10
+M      AUTHORS
 
-    Preparation for 2.2.6
+commit 714ed64ebe1bef13073168e78b9a9a86bb2588dc
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-01-26
 
-    Updated NEWS and configure.in.
+    Added Brother template, changed obsolete part numbers
 
-M      NEWS
-M      configure.in
+M      templates/brother-other-templates.xml
 
-commit 6f8023f3f90e360ed1911aaf95ab07dd9d1fd00d
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-05
+commit cb3d9f9aa69b717f6f6d2870b2eb7aa9bc37215a
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-19
 
-    Automatically generate ChangeLog when building dist
+    Updated Spanish translation
 
-    Automatically generate ChangeLog when building distributions.
-    Archived
-    pre 2.2 ChangeLog entries.
+M      help/es/es.po
 
-M      .gitignore
-M      ChangeLog
-C090   ChangeLog       ChangeLog.pre-2.2
-M      Makefile.am
+commit 6c28e77fb42ad477370cdd4e104c2a05981951f3
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-16
 
-commit 9542ced852f02b4ded00a923ea99bbfc5262234b
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-05
+    Updated Spanish translation
 
-    Caught up on user submitted templates.
+M      po/es.po
 
-    Added user submitted templates and acknowledgements.
+commit ebe69bb2755eef349159e9ccfbdc34c1906038e1
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-13
 
-M      AUTHORS
-M      data/templates/misc-iso-templates.xml
-M      data/templates/zweckform-iso-templates.xml
+    Updated Spanish translation
 
-commit a2ad57fa1a0c1e826ff1b758a3baeed263d4b1a8
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-04
+M      help/es/es.po
 
-    Fixed merge inconsistencies and crash
+commit 69517f49cd41645693dc186f791a7a32203d92ba
+Author: Wouter Bolsterlee <wbolster@gnome.org>
+Date:  2011-01-08
 
-    merge.c:
-       Fixed crash when trying to print when a "key" radio has been
-       selected
-       but no key has been selected yet.
+    Added Dutch translation by Mario Blättermann and Hannie Dumoleyn
 
-    object-editor-*-page.c:
-       Fixed potential inconsistencies with "key" radio buttons when
-       a merge
-       source has not been selected but the field indicates that it is
-       using a
-       merge key.  This can happen when opening a glabels file that
-       has a merg
-       type not supported by the current instance of glabels.
+M      po/LINGUAS
+A      po/nl.po
 
-    xml-label.c:
-       Also when parsing a merge field that has a merge type not
-       supported,
-       don't continue parsing it.
+commit 9b82ba17efaef7634a4be9fef0dd90313ed8e3b1
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-06
 
-M      src/merge.c
-M      src/object-editor-bc-page.c
-M      src/object-editor-data-page.c
-M      src/object-editor-fill-page.c
-M      src/object-editor-image-page.c
-M      src/object-editor-line-page.c
-M      src/object-editor-shadow-page.c
-M      src/object-editor-text-page.c
-M      src/xml-label.c
+    Updated Spanish translation
 
-commit 4cbc3bf59c5b3f2fe8310a87a19c86f414e2e0ae
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+M      help/es/es.po
 
-    Updated German translation
+commit 87b856938c42a25544aa0d7fcc93ad34f008e935
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-01-03
 
-M      po/de.po
+    Updated Spanish translation
 
-commit 50e804b0aae8214a4354d084e36be88eace03f67
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+M      help/es/es.po
 
-    Updated German translation
+commit b4de56df5fa411a7e79333ab4df8e3f2422be099
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-01-03
 
-M      po/de.po
+    More preparation for 2.3.1
+
+M      NEWS
+
+commit bb1bd1a68c5d188ccad3c0fd49a65b5d57566e96
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2011-01-02
+
+    Updated French translation
 
-commit 499d70c757fe12219337e2ec9da267b723a1004c
+M      po/fr.po
+
+commit 4d5ca3f941c77b9a2a8829dd6748e3a063072317
+Author: Joe Hansen <joedalton2@yahoo.dk>
+Date:  2011-01-02
+
+    Updated Danish translation
+
+M      po/da.po
+
+commit 40710db147d8b45e7aea4fe050bf0fec909e80ba
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+Date:  2011-01-02
 
-    Updated German doc translation
+    [l10n] Updated German doc translation
 
 M      help/de/de.po
 
-commit 7e1940ad444877f6fe17cff8befd469e4ee22ee8
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+commit 8fe15148b83c12d1f67631198edc1d83393f1b99
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-01-01
 
-    Forgotten to add before
+    Preparation for 2.3.1
 
-A      help/de/figures/merge-ex3-1.png
-A      help/de/figures/merge-ex3-2.png
+M      configure.ac
 
-commit f01319ec821d3a3a0463010ca001eaf883cfd98a
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+commit 378e18ebc7c08075fa0d66abc136335d9d1ab4dd
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-29
 
-    New screenshots
+    Updated Spanish translation
 
-M      help/C/figures/merge-ex3-1.png
-M      help/C/figures/merge-ex3-2.png
+M      help/es/es.po
 
-commit 4b24ee895b75d59225bedee6ee6a1140a54eebcb
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-11-04
+commit 677ce8eedc473d132ca15fef0e92d8d7dcfe1003
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-27
 
-    Updated German doc translation
+    Some cleanup of built-in barcode code.
 
-M      po/de.po
+    - Validate data rather than filtering it into something canonical
+    - Reconcile style and design patterns between all built-in backends
 
-commit b9b0ec1e9eaedcf92ac4a2600d2e09a3a9f466c8
-Author: Daniel Nylander <po@danielnylander.se>
-Date:  2009-11-04
+M      libglbarcode/lgl-barcode-code39.c
+M      libglbarcode/lgl-barcode-onecode.c
+M      libglbarcode/lgl-barcode-postnet.c
 
-    Updated Swedish translation
+commit e23b1e0e460896905eed8c4c8c1ce7dc4a06b6d6
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-12-27
 
-M      po/sv.po
+    Update Czech translation by Marek Cernocky
+
+    Reviewed by Petr Kovar.
+
+M      po/cs.po
 
-commit d0777b14a00530d90dab29e85aabad7b6ff57b67
+commit 73897c1e98299fff6a935757ede72b32cb838637
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-11-03
+Date:  2010-12-26
 
-    Updated documentation for 2.2.6
+    Updated help screenshots.
 
-    - Added an example for doing document merge from evolution data
-    server.  (Mario Blättermann)
-    - Updated most screenshots to 2.2.6 with Clearlooks theme.
-    - Minor corrections
+    Updated screenshots in help to be consistent with current development
+    version of glabels.  Updated help text to be consistent with the new
+    screenshots.
 
-A      .gitignore
-M      help/C/figures/main-window-empty.png
+M      help/C/editprop.page
+M      help/C/figures/introduction-glabels-main-window.png
+D      help/C/figures/main-window-empty.png
 M      help/C/figures/merge-ex1-1.png
 M      help/C/figures/merge-ex1-2.png
 M      help/C/figures/merge-ex1-3.png
@@ -600,211 +614,6110 @@ M      help/C/figures/merge-ex2-3.png
 M      help/C/figures/merge-ex2-4.png
 A      help/C/figures/merge-ex3-1.png
 A      help/C/figures/merge-ex3-2.png
+A      help/C/figures/merge-ex3-3.png
+A      help/C/figures/merge-ex3-4.png
 M      help/C/figures/object-editor-sidebar.png
 M      help/C/figures/print-copies.png
 M      help/C/figures/print-merge.png
-M      help/C/glabels.xml
-M      help/Makefile.am
+M      help/C/merge-ex1.page
+M      help/C/merge-ex2.page
+M      help/C/merge-ex3.page
 
-commit 8fe92bd1ae20ab937f2a5de135c80d92e4c685eb
+commit 2fde09a614399ab805e94b036ac367beaa5a16c9
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-10-25
+Date:  2010-12-24
 
-    Start new path when drawing round labels
+    Fix crash when encountering an invalid barcode backend
 
-    Start new path when drawing round labels.  This fixes a bug, where
-    if the
-    top most object is a text object, an extras line would be drawn.
+    A file may have been saved from an instance of glabels that had
+    a backend
+    enabled that is not enabled in the current instance of glabels.
+    This fix
+    accounts for this. It is also possible that the glabels file
+    was created
+    manually with an invalid backend ID or a typo.
 
-M      src/cairo-label-path.c
+M      src/bc-backends.c
+M      src/bc-backends.h
+M      src/xml-label.c
 
-commit d55ffd2866c5d6a20c1236f087b18316989c87dd
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-10-25
+commit a0156d27b51928bea9acda121ab616a571b47836
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-24
+
+    Updated Spanish translation
 
-    Fixed incorrect storage of glPrefsModel's base object
+M      help/es/es.po
 
-    Parent object was declared as a pointer, so there was not enough
-    room for
-    the parent/base object.  This potentially could have caused havoc
-    with this
-    object.
+commit 4967753a46173c4123e9cd958b2d1af0076be352
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-24
 
-M      src/prefs-model.h
+    Updated Spanish translation
+
+M      po/es.po
 
-commit 33821ebe5b65a8191215646fab2be577854bfb17
+commit fb9fc961547a370f916b4a263d8ecca3d39077d4
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-10-10
+Date:  2010-12-23
 
-    Converted translations to UTF-8
+    Some ideas for the future
 
-M      po/pl.po
-M      po/pt_BR.po
+M      TODO
 
-commit 69e71bfe60909459ed177b767b40f0940824ad6b
-Author: Daniel Nylander <po@danielnylander.se>
-Date:  2009-10-06
+commit 1df0cd9751734cc89f71f849ecb434f8804633c1
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-23
 
-    Added Swedish translation
+    Updated Spanish translation
 
-M      po/LINGUAS
-A      po/sv.po
+M      help/es/es.po
+
+commit cfd6986162064bb23ef223372735c9dfc2b140a7
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-23
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 78173bdf8d3a32bb7d7c01567c47a3c0a7200f57
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-22
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 3d0f7724236b654adf326a926837428bba8d09d0
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-22
+
+    Updated Spanish translation
 
-commit e04fe3a1a5b378412eb153350e2fb2b8a22eb8b1
+M      po/es.po
+
+commit 91dae28aba1ee42a015a2d5594d6f916affaa957
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-10-06
+Date:  2010-12-22
 
-    Converted polish translation to UTF-8
+    Added Dataline templates
 
-M      po/pl.po
+M      templates/dataline-iso-templates.xml
 
-commit 37b8623b1615da2b54cf2b22444f89c3e36b429d
-Author: Claude Paroz <claude@2xlibre.net>
-Date:  2009-10-06
+commit c88852dd70f0ac735515cc9cc26ab1803a257832
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-22
 
-    Convert zh_TW translation to UTF-8
+    Added JAC templates
 
-M      po/LINGUAS
-R089   po/zh_TW.Big5.po        po/zh_TW.po
+M      po/de.po
+M      templates/jac-iso-templates.xml
 
-commit 885961d5ac802bf487d34b400679b2f15855d1e4
+commit 4d3bc4e4a59890004ec9d0eb7964e37f26813208
 Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-10-06
+Date:  2010-12-21
 
-    Updated German translation
+    [l10n] Updated German translation
 
 M      po/de.po
 
-commit 3a3f0f3859c7ddeeeb9b2251fddf2c066ee9ca99
+commit 3f0a08e40ffb1efa553a8cfd3fdf55cb1f821c98
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-21
+
+    Added Hama templates. Hama is now fully covered.
+
+M      templates/hama-iso-templates.xml
+
+commit 7db09dd9f349eba5e276fe0f2c4795339320504e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-20
+
+    Removed comment which prevents intltool from running properly
+
+M      templates/meritline-us-templates.xml
+
+commit 4a60da1dfe64df62cc7b8b01d709deeb893b1a5f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-20
+
+    Added Meritline templates
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+A      templates/meritline-us-templates.xml
+M      templates/misc-us-templates.xml
+
+commit 8c1f05cfb999c20d1cc8821fa60d8ad68568ba9c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-20
+
+    Moved Dataline template to its own file
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+A      templates/dataline-iso-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/vendors.xml
+
+commit 554266756a638ad0ee161decfe07bb86b8bc4b3f
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-10-05
+Date:  2010-12-19
 
-    Moved files to top-level of branch.
+    Fix vertical expansion of various widgets
 
-    Moved files to top-level directory of glabels_2_2 branch.  This is
-    an artifact
-    of the old SVN layout.  Fixed problems with zh_CN.po that prevented
-    push.
+    Gtk3 has new behavior for expansion of widgets. This commit turns
+    off vertical
+    expansion for various widgets created with builder UI files.
+    These properties
+    have been added manually to these files, so they could be easily
+    wiped out
+    by editing them with glade.
 
-R100   glabels2/help/de/de.po  help/de/de.po
-R100   glabels2/help/de/figures/main-window-empty.png
-help/de/figures/main-window-empty.png
-R100   glabels2/help/de/figures/merge-ex1-1.png
-help/de/figures/merge-ex1-1.png
-R100   glabels2/help/de/figures/merge-ex1-2.png
-help/de/figures/merge-ex1-2.png
-R100   glabels2/help/de/figures/merge-ex1-3.png
-help/de/figures/merge-ex1-3.png
-R100   glabels2/help/de/figures/merge-ex1-4.png
-help/de/figures/merge-ex1-4.png
-R100   glabels2/help/de/figures/merge-ex2-1.png
-help/de/figures/merge-ex2-1.png
-R100   glabels2/help/de/figures/merge-ex2-2.png
-help/de/figures/merge-ex2-2.png
-R100   glabels2/help/de/figures/merge-ex2-3.png
-help/de/figures/merge-ex2-3.png
-R100   glabels2/help/de/figures/merge-ex2-4.png
-help/de/figures/merge-ex2-4.png
-R100   glabels2/help/de/figures/object-editor-sidebar.png
-help/de/figures/object-editor-sidebar.png
-R100   glabels2/help/de/figures/print-copies.png
-help/de/figures/print-copies.png
-R100   glabels2/help/de/figures/print-merge.png
-help/de/figures/print-merge.png
-R100   glabels2/help/glabels-help.pot  help/glabels-help.pot
-R100   glabels2/help/glabels.omf.in    help/glabels.omf.in
-R100   glabels2/po/LINGUAS     po/LINGUAS
-R100   glabels2/po/ca.po       po/ca.po
-R099   glabels2/po/zh_CN.po    po/zh_CN.po
+M      data/ui/object-editor.ui
+M      data/ui/print-op-dialog-custom-widget.ui
 
-commit 484197466a1ddace52d14046709ad6e8c4f17bbc
-Merge: 9ebfc49 d3a7257
+commit 4f37ea189b9cc80ef25d608c024273a345970722
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-09-28
+Date:  2010-12-19
+
+    Some coding style cleanup.
+
+M      libglabels/lgl-template.h
+M      libglabels/lgl-units.h
+M      libglbarcode/lgl-barcode-render-to-cairo.c
+M      libglbarcode/lgl-barcode.h
+M      src/bc-builtin.c
+M      src/bc-gnubarcode.c
+M      src/bc-iec16022.c
+M      src/bc-iec18004.c
+M      src/bc-zint.c
+M      src/color-combo-button.c
+M      src/color-combo-color-menu-item.c
+M      src/color-combo-menu.c
+M      src/color-combo.c
+M      src/color-history-model.c
+M      src/color-swatch.c
+M      src/debug.h
+M      src/field-button-menu.c
+M      src/field-button.c
+M      src/font-combo-menu-item.c
+M      src/font-combo-menu.c
+M      src/font-combo.c
+M      src/font-history-model.c
+M      src/font-sample.c
+M      src/label-barcode.c
+M      src/label-box.c
+M      src/label-ellipse.c
+M      src/label-image.c
+M      src/label-line.c
+M      src/label-object.c
+M      src/label-object.h
+M      src/label-text.c
+M      src/label.c
+M      src/media-select.c
+M      src/merge-evolution.c
+M      src/merge-properties-dialog.c
+M      src/merge-text.c
+M      src/merge-vcard.c
+M      src/merge.c
+M      src/merge.h
+M      src/message-bar.c
+M      src/mini-label-preview.c
+M      src/mini-preview.c
+M      src/new-label-dialog.c
+M      src/object-editor.c
+M      src/prefs-dialog.c
+M      src/prefs-model.c
+M      src/print-op-dialog.c
+M      src/print-op.c
+M      src/print.c
+M      src/template-designer.c
+M      src/template-history-model.c
+M      src/ui-property-bar.c
+M      src/ui-sidebar.c
+M      src/view.c
+M      src/view.h
+M      src/wdgt-chain-button.c
+M      src/window.c
+M      src/xml-label.h
+
+commit 791f29c01c646eaebc443c5220405d399b6082cb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-18
+
+    Coding style cleanup.
+
+M      libglabels/lgl-category.c
+M      libglabels/lgl-category.h
+M      libglabels/lgl-db.c
+M      libglabels/lgl-paper.c
+M      libglabels/lgl-paper.h
+M      libglabels/lgl-str.c
+M      libglabels/lgl-template.c
+M      libglabels/lgl-template.h
+M      libglabels/lgl-units.c
+M      libglabels/lgl-units.h
+M      libglabels/lgl-vendor.c
+M      libglabels/lgl-vendor.h
+M      libglabels/lgl-xml-category.c
+M      libglabels/lgl-xml-paper.c
+M      libglabels/lgl-xml-template.c
+M      libglabels/lgl-xml-template.h
+M      libglabels/lgl-xml-vendor.c
+M      libglabels/lgl-xml.c
+M      libglabels/lgl-xml.h
+
+commit 5c6f4d559896d7290d8877651d60010eefc1c6bb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-18
+
+    Renamed libglabels source files to have "lgl-" prefix.
+
+    Improve odds that source files (headers in particular) remain
+    unique.
+
+M      docs/libglabels/libglabels-3.0-sections.txt
+M      libglabels/Makefile.am
+R096   libglabels/category.c   libglabels/lgl-category.c
+R095   libglabels/category.h   libglabels/lgl-category.h
+R099   libglabels/db.c libglabels/lgl-db.c
+R097   libglabels/db.h libglabels/lgl-db.h
+R097   libglabels/paper.c      libglabels/lgl-paper.c
+R096   libglabels/paper.h      libglabels/lgl-paper.h
+R098   libglabels/str.c        libglabels/lgl-str.c
+R094   libglabels/str.h        libglabels/lgl-str.h
+R099   libglabels/template.c   libglabels/lgl-template.c
+R099   libglabels/template.h   libglabels/lgl-template.h
+R098   libglabels/units.c      libglabels/lgl-units.c
+R096   libglabels/units.h      libglabels/lgl-units.h
+R096   libglabels/vendor.c     libglabels/lgl-vendor.c
+R095   libglabels/vendor.h     libglabels/lgl-vendor.h
+R097   libglabels/xml-category.c       libglabels/lgl-xml-category.c
+R092   libglabels/xml-category.h       libglabels/lgl-xml-category.h
+R097   libglabels/xml-paper.c  libglabels/lgl-xml-paper.c
+R092   libglabels/xml-paper.h  libglabels/lgl-xml-paper.h
+R099   libglabels/xml-template.c       libglabels/lgl-xml-template.c
+R094   libglabels/xml-template.h       libglabels/lgl-xml-template.h
+R096   libglabels/xml-vendor.c libglabels/lgl-xml-vendor.c
+R092   libglabels/xml-vendor.h libglabels/lgl-xml-vendor.h
+R099   libglabels/xml.c        libglabels/lgl-xml.c
+R096   libglabels/xml.h        libglabels/lgl-xml.h
+M      libglabels/libglabels-private.h
+M      libglabels/libglabels.h
+M      po/POTFILES.in
+
+commit a20a5bbf88612bd6ef88e7eeb022fca824905da8
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-18
+
+    Fixed potential memory leak.
+
+M      libglbarcode/lgl-barcode-code39.c
+
+commit 429d875df7f9ed902b5a15d017e37eef49336326
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Updated Southworth template
 
-    Merge original SVN glabels-2_2 branch into glabels_2_2
+M      templates/misc-us-templates.xml
 
-    Restored history past 2.2.5 release that was lost when originally
-    creating
-    branch from SVN.
+commit 38e921a6bcc6a016accbdb6337f26df5244c4e62
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Updated Sigel template
+
+M      templates/misc-iso-templates.xml
+
+commit 303ba997361a9d120a4cb91246811e7f9502bcba
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Added Sigel template
+
+M      templates/misc-iso-templates.xml
+
+commit 39b99eeb9bc19230899c9bc7014198f8bfebe1c6
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Added note about DECAdry templates
+
+M      templates/decadry-iso-templates.xml
+
+commit 5dcf1c0c74a81c457207ce1ddfa7768a70e7c5ff
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Added a product_url
+
+M      templates/misc-us-templates.xml
+
+commit 1a5eccae2505e61059f59be8774b252548a6491c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Added Ascom templates
+
+M      templates/ascom-iso-templates.xml
+
+commit 3bcf37e19f90aaa61ae5a0b2092583c438c4973e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Added Ascom file
+
+A      templates/ascom-iso-templates.xml
+
+commit 2b1ed215968487da9ac7c0ceb7123028a8729b6e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-17
+
+    Moved Ascom template to its own file
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+M      templates/misc-iso-templates.xml
+
+commit ac9f784be20aa4878cf45ceefb7f9a6d23568301
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-15
+
+    Updated Spanish translation
+
+M      po/es.po
 
-commit 9ebfc492936b30b4095ae458278e63c51caf3f67
+commit 01be49583ebeab6d38905fd6c08e6db614bdcdba
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-13
+
+    Added Herma templates
+
+M      templates/herma-iso-templates.xml
+
+commit 1c923cfa68fb0277fd732fa870ca89a67916d21a
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-12
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 4ebb369584f6ae3efa6db7a95b32514c1cfa00e4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-12
+
+    Added hint about Ascom labels
+
+M      templates/misc-iso-templates.xml
+
+commit ed47bfc6fecd57b6db3b1f1903c4dd60925a6cb7
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-12
+
+    Added Ascom URL
+
+M      templates/vendors.xml
+
+commit 86b68f3318b926e1873bd5832b932975368bc11a
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-09-26
+Date:  2010-12-11
 
-    Reorganized glabels_2_2 branch so that it is the top-level glabels
-    directory,
-    instead of having a glabels2 subdirectory.
+    Cleanup of ui files.
 
-R100   glabels2/AUTHORS        AUTHORS
-R100   glabels2/COPYING        COPYING
-R100   glabels2/COPYING-DOCS   COPYING-DOCS
-R100   glabels2/COPYING-LIBGLABELS     COPYING-LIBGLABELS
-R100   glabels2/COPYING.README_FIRST   COPYING.README_FIRST
-R100   glabels2/ChangeLog      ChangeLog
-R100   glabels2/INSTALL        INSTALL
-R100   glabels2/Makefile.am    Makefile.am
-R100   glabels2/NEWS   NEWS
-R100   glabels2/README README
-R100   glabels2/TODO   TODO
-R100   glabels2/autogen.sh     autogen.sh
-R100   glabels2/barcode-0.98/COPYING   barcode-0.98/COPYING
-R100   glabels2/barcode-0.98/ChangeLog barcode-0.98/ChangeLog
-R100   glabels2/barcode-0.98/INSTALL   barcode-0.98/INSTALL
-R100   glabels2/barcode-0.98/Makefile.am       barcode-0.98/Makefile.am
-R100   glabels2/barcode-0.98/Makefile.in.dist
+    Regenerated ui files using glade from jhbuild.
+
+M      data/ui/media-select.ui
+M      data/ui/merge-properties-dialog.ui
+M      data/ui/new-label-dialog.ui
+M      data/ui/object-editor.ui
+M      data/ui/prefs-dialog.ui
+M      data/ui/print-op-dialog-custom-widget.ui
+M      data/ui/property-bar.ui
+M      data/ui/template-designer.ui
+
+commit 5860b2b1dc85039d79a40502c2b3fa7e4843d7ee
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-11
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 0e29ea75a7daf3d3b1adc40aa5348adbdafc428c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-11
+
+    Make all g_warning and g_message untranslatable
+
+M      libglabels/template.c
+M      libglabels/xml-template.c
+
+commit 8963061c3080ead1a2000f829d506f6d510943bf
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-10
+
+    Disconnect prefs changed callback when destroying view.
+
+    This fixes a crash when changing prefs after deleting a window.
+
+M      src/view.c
+
+commit c6ccdd681e8f32471c0cb51030869416d7534d45
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-10
+
+    Removed duplicate template
+
+M      templates/herma-iso-templates.xml
+
+commit 4f12b28e6f0d77a360b74ee57db15612cafbf098
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-10
+
+    Make all g_warning and g_message untranslatable for better bug
+    handling
+
+M      src/merge-evolution.c
+M      src/xml-label-04.c
+M      src/xml-label.c
+
+commit 5bd9bc4fc3b3ab019b8e290d7ae48bd3a63cd320
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-09
+
+    Cleanup some '-Wall' warnings.
+
+M      libglabels/db.c
+M      src/color-swatch.c
+M      src/font-sample.c
+M      src/label-barcode.c
+
+commit 90b87092927aa6b706a7a220b81cf8ef14e81e48
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added more Herma templates
+
+M      templates/herma-iso-templates.xml
+
+commit d1e3f397bb25c41ee43584c7929a3d976b9dbdae
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 318d394fed4e29e0793d3467f057b850185a28b8
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added more Hama templates
+
+M      templates/hama-iso-templates.xml
+
+commit bc208ecf065133508b0d121ce3aab2bd2d4c3df2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added missing underscore
+
+M      templates/jac-iso-templates.xml
+
+commit 345ff45db2e8c21a4e8df1243ae96960cd46e49a
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 9eaaa7570f8290b890f546f4c20625fe2f50dd44
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added more Hama templates
+
+M      templates/hama-iso-templates.xml
+
+commit f8a50b04009496d09fabfb418e91ae15c648c38d
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Fixed bug in Geha templates
+
+M      templates/geha-iso-templates.xml
+
+commit 2ebcd4192a7fcb70e4b0a778b3902c4e524af991
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 2edf2ba85b43199407eea3a1421b9c5d6ea0a4bd
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added some equivalent templates
+
+M      templates/hama-iso-templates.xml
+
+commit 4bd003abfb60e80544e6d824dfccf2d7cbc1ac2a
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added more Hama products, added a new category »photo« and assigned
+    it to some products
+
+M      help/C/mancreate.page
+M      templates/categories.xml
+M      templates/geha-iso-templates.xml
+M      templates/hama-iso-templates.xml
+M      templates/pearl-iso-templates.xml
+
+commit 36f4649ebd535aae1cbeb43553d04434fc1d806f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added Hama template page
+
+A      templates/hama-iso-templates.xml
+
+commit 0c6ebf2102d079a4480ba06aaf1842f71e1a234a
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Initial page for Hama templates
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+M      templates/jac-iso-templates.xml
+M      templates/vendors.xml
+
+commit a125051c16605b2247acd7b539897c491e296edd
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added hint about data for creating Geha templates
+
+M      templates/geha-iso-templates.xml
+
+commit e9f7e82b1c50b54c3556db73c2d0d240ffb91171
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit f79686873af4021a7c794e5830c9ae08f81bf0f8
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added missing underscores for translations
+
+M      templates/geha-iso-templates.xml
+
+commit 39731183520b9da4382589c8857cba02190c1450
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added new Geha template. All current Geha templates are now present.
+
+M      templates/geha-iso-templates.xml
+
+commit c89c44f2580acde5cf1f00ac0ea3d21c04de9b9c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Added lost OMF file again
+
+A      help/glabels.omf.in
+
+commit f5c5ab05261c857f5c5730dab51a47e06c3890f9
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    Reorganized the PEARL templates
+
+M      templates/pearl-iso-templates.xml
+
+commit ddcfb2dc3030a9fd3a3baf31b7c044b3ee5ce842
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-09
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 81d3f3f11939e6feba33cfe6db56529e2ed7f2fd
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-07
+
+    Cleanup of "Manually creating new templates" page.
+
+M      help/C/mancreate.page
+
+commit 02525ecebbfac77a732cf30354f00da86a10aef1
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-07
+
+    Removed duplicate meta tag
+
+M      templates/geha-iso-templates.xml
+
+commit eac7f6ae1d9aa4059d7f5955fa7be1627d5b3170
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-07
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 9429e4d84e437e5996e4f9d3841eb98fca91f567
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-07
+
+    Added more Geha templates
+
+M      templates/geha-iso-templates.xml
+
+commit 0dc2f0a1cfcef51429248c80522723a1a5a0b71b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-07
+
+    Optimize loading of barcode styles.
+
+    Only load barcode styles into object editor combo box if backend
+    ID has
+    changed.  Otherwise, skip loading. This seems to be a very expensive
+    operation and would manifest itself as sluggish resizes of barcodes.
+
+M      src/object-editor-bc-page.c
+M      src/object-editor-private.h
+M      src/object-editor.c
+
+commit 01b6f0b41fc8ab4f24f3bbb49daeb9d537c53189
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-07
+
+    Some optimization of barcode updates.
+
+    Keep a cached copy of the display glBarcode, so that it does not
+    need to be
+    regenerated on every update.
+
+M      src/label-barcode.c
+M      src/label-object.c
+M      src/label-object.h
+
+commit c64827154b26e3cae7ba3f60e175ca38e242e2bd
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-07
+
+    Optimized the handling of moved objects.
+
+    Created a separate "moved" signal for objects, so that we don't
+    waste time
+    updating unrelated controls in the object editor.  This currently
+    is most
+    visible with barcode objects.
+
+M      src/label-object.c
+M      src/label-object.h
+M      src/label.c
+M      src/object-editor.c
+
+commit 6e818159dd6c0f7107c9ecac8fcebb44bdbb1ad4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-06
+
+    Added missing filename to POTFILES.in
+
+M      po/POTFILES.in
+
+commit 1be777aae8bae2c1119b0cb5829f2da801548e45
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-06
+
+    Added more Geha templates
+
+M      templates/geha-iso-templates.xml
+
+commit 63ac5e48f813c53f5b3b8bf698ae01c72daa9be3
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-06
+
+    Moved Geha template to its own file
+
+M      templates/Makefile.am
+A      templates/geha-iso-templates.xml
+M      templates/misc-iso-templates.xml
+
+commit 4b278cb83e512bdc271373e152018f17e980baae
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-05
+
+    Created smaller logo for manual title.
+
+M      help/C/figures/glabels-logo.png
+
+commit cd75de36caeb263c82800231e2510f1cabadc04c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-05
+
+    Cleanup of some documentation artifacts.
+
+    - Removed omf file from help/.
+    - Removed docs/libgl*/tmpl/libgl*-unused.sgml which are automatically
+    generated.
+    - Removed documentation refs to lgl_db_get_template_list_unique()
+    which has
+      been recently removed from libglabels.
+    - Updated .gitignore.
+
+M      .gitignore
+M      docs/libglabels/libglabels-3.0-sections.txt
+M      docs/libglabels/tmpl/db.sgml
+D      docs/libglabels/tmpl/libglabels-3.0-unused.sgml
+D      docs/libglbarcode/tmpl/libglbarcode-3.0-unused.sgml
+D      help/glabels-3.0.omf.in
+M      libglabels/db.c
+
+commit 60519e8f9b7be15d5988b03c1a95cea45ca00657
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-05
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 4e51ab44ec19ac818a5b8d36f2720d1469c20f7c
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-05
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 5bdab116303bdcdc011657030a3813c364e319ed
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-05
+
+    Fixed wrong template numbers
+
+M      templates/herma-iso-templates.xml
+
+commit 350bb1773bd34fb92c111e231d774ea173615594
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-04
+
+    Search both ~/.glabels and ${XDG_CONFIG_HOME}/libglabels/templates.
+
+    Keep ~/.glabels as an alternate location for user defined templates.
+    This
+    directory would hold manually created templates as well as template
+    designer
+    templates from previous versions.  The new template designer will
+    manage
+    its templates in ${XDG_CONFIG_HOME}/libglabels/templates.
+
+M      libglabels/db.c
+M      libglabels/template.c
+M      libglabels/xml-template.c
+
+commit f20a898ceef00151fd13afbf04c6961cff39ffe9
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-04
+
+    Added namespace declaration
+
+M      help/C/mancreate.page
+
+commit ff2e814d1014d59ee701a8d6f47df81fe782eeb4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-04
+
+    Added its: to the untranslatable strings
+
+M      help/C/mancreate.page
+
+commit d086e015fc2e516ac10bcf2915e36164acf03afa
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-04
+
+    Added markup for non-translatable items
+
+M      help/C/mancreate.page
+
+commit 9f338207d5ec3a847a65d191c44e78055b3983df
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-04
+
+    Removed artifact of template aliases.
+
+M      libglabels/db.c
+M      libglabels/db.h
+M      src/mini-preview-pixbuf-cache.c
+
+commit dc41a686c30e7e80eb3e54cacba4c2af94e678f8
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-12-03
+
+    Add some selection slop to barcode and text objects
+
+    Add a 4 pixel slop area around barcode lines and text glyphs in
+    object_at
+    methods of barcode and text objects.  This will hopefully make
+    selecting
+    these objects less frustrating while still allowing selection of
+    background
+    objects through the negative space of these objects.
+
+M      src/label-barcode.c
+M      src/label-text.c
+
+commit 17fbc0ff3528298065c3df6dce0f38bfd8972899
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-02
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 952e6c14ad7a544a6bf820801fa40fb7b6b222b2
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-12-02
+
+    Updated Spanish translation
+
+M      help/es/es.po
+M      po/es.po
+
+commit ffaf06a95c635ef26335da26d63a74511068e03c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-02
+
+    [l10n] Some cleanup
+
+M      help/de/de.po
+
+commit c3ef406eccdd4eb9d6e5651c72766a0292ab1d57
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-02
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit cccabeafc0c73e4ec1698bb9569f03621a58af71
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-02
+
+    Fixed typo
+
+M      help/C/multifile.page
+
+commit 5f1338e0bb4df1ac40b26b89c6c49a319de94287
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-02
+
+    Made email links clickable
+
+M      help/C/about.page
+M      help/C/mancreate.page
+
+commit 3e42b1117fb1c4251a22873436412f9e07c5e7c1
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-01
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 4ea2ba2bcf00a753ee4e061af1bd8b02742f6753
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-01
+
+    Added note about available categories
+
+M      help/C/mancreate.page
+
+commit cae9d526245a50b945404d0fffa4722a33323a0b
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-01
+
+    Added new template equivalents again
+
+M      templates/herma-iso-templates.xml
+
+commit 6dc9e7bcbac90c94e3af34eabcabe08e3abeceb5
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-12-01
+
+    Added new template equivalents
+
+M      templates/herma-iso-templates.xml
+
+commit a82d4a9a8badd982f39b0a16b52c1459c3604390
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-30
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 5447097d6fb8b640873327611f607f1fbab82bb6
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-30
+
+    Added new category and assigned some templates to this category
+
+M      templates/categories.xml
+M      templates/pearl-iso-templates.xml
+
+commit ace7ef5e6b10569d736ad2cdf4718b6aeab5198c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-30
+
+    [i18n] Added new templates and some cleanup
+
+M      templates/herma-iso-templates.xml
+
+commit 1c5a40ac06c7fd9f809974784c83205af2890a38
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-30
+
+    [i18n] Added new templates
+
+M      templates/herma-iso-templates.xml
+
+commit 0dfe4457223fae2d4b21c758fde905d4f8e78ea3
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-28
+
+    Fixed malformed XML file.
+
+M      templates/misc-iso-templates.xml
+
+commit 043939ac8cf4396319cec17b871d9f4c891a34ab
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-27
+
+    Added more templates
+
+M      templates/herma-iso-templates.xml
+
+commit f3c77ad8a3482627572448d65df2e756763c9e90
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-27
+
+    Moved DataBecker templates to their own file, added one more template
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+A      templates/databecker-iso-templates.xml
+M      templates/misc-iso-templates.xml
+
+commit d48275b51809ebfc4aa926e311470e0d8032e067
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-27
+
+    Added URL tooltips to links.
+
+M      src/new-label-dialog.c
+
+commit 30916207aa15fde60417267c059340d88a193602
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-11-27
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit ec3dbcf7eaf48d6f9ec266075fdf67d54011c23f
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-11-27
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit f8095371bfa8914605162aa3ea34fd99cd4ad8cc
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-27
+
+    Improve selection of barcode objects.
+
+    Allow selection of barcode objects by clicking on the alternate
+    text when
+    a valid barcode cannot be displayed.
+
+M      src/label-barcode.c
+
+commit 7c8701b3c9063510e362d8a0a786976ddca570e7
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-26
+
+    Fixed problem with creation of 1st barcode, again.
+
+    Previous fix only temporarily masked the problem.  The problem is that
+    the first time the barcode tabs are made visible, the digits spin
+    button
+    would emit a "changed" signal.  The fix is to connect to the
+    "value-changed"
+    signal instead.
+
+    This commit also includes replacing the stop_signals flag with
+    explicit
+    signal blockers.
+
+M      src/object-editor-bc-page.c
+M      src/object-editor-data-page.c
+M      src/object-editor-fill-page.c
+M      src/object-editor-image-page.c
+M      src/object-editor-line-page.c
+M      src/object-editor-lsize-page.c
+M      src/object-editor-position-page.c
+M      src/object-editor-private.h
+M      src/object-editor-shadow-page.c
+M      src/object-editor-size-page.c
+M      src/object-editor-text-page.c
+M      src/object-editor.c
+
+commit c0905027d4dd2667ed738c6679fdf657e9d4cf40
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-26
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit ab4e9596763ea64304efc2fe962344b5cc61587c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-26
+
+    Added note to template designer.
+
+    Added note to template designer about the possibility of more
+    than 2 layouts.
+
+M      data/ui/template-designer.ui
+
+commit aae747108292ab75611e891ffecfcad89382ccdc
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-26
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit ed3c4f8c1e2df4b740698425a15a3ad8080c5335
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-26
+
+    Added Sattleford VM-6084 label, added new category for elliptical
+    labels
+
+M      templates/categories.xml
+M      templates/pearl-iso-templates.xml
+
+commit 63396b3df293ba68fbe6a2507b97e74201c1794f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-26
+
+    Added more vendor definitions and URLs
+
+M      templates/vendors.xml
+
+commit 3cae5b04317e8b1ad5069bee713254b5c4f51125
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-26
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 30419b26c459fd1a9339c1c8a0341fc43ea7308f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-25
+
+    Cleanup of build system.
+
+    - 'make distcheck' is now successful
+    - Removed several old artifacts
+
+M      .gitignore
+M      Makefile.am
+M      configure.ac
+M      data/desktop/Makefile.am
+M      data/mime/Makefile.am
+M      po/POTFILES.in
+A      po/POTFILES.skip
+M      src/Makefile.am
+
+commit f9d15efd6543ae69c821010751ef960d97877349
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-25
+
+    Remove deprecated alias node support for templates.
+
+    Removed support for the "Alias" node in templates. For backwards
+    compatibility alias nodes will be skipped over.  This greatly
+    simplifies
+    the iteration through the template database, since all templates are
+    fully realized.
+
+M      docs/libglabels/libglabels-3.0-sections.txt
+M      docs/libglabels/tmpl/db.sgml
+M      docs/libglabels/tmpl/libglabels-3.0-unused.sgml
+M      docs/libglabels/tmpl/template.sgml
+M      help/C/mancreate.page
+M      libglabels/db.c
+M      libglabels/template.c
+M      libglabels/template.h
+M      libglabels/xml-template.c
+M      src/mini-preview-pixbuf-cache.c
+M      templates/glabels-2.3.dtd
+
+commit 5003bd33e74c1de3fbe3dd7b5b206aff61f78658
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-25
+
+    Cleanup of template database.
+
+    - Alphabetized the templates in the misc-*-templates.xml files.
+    - Replaced the last of the deprecated "Alias" tags.
+    - Added TODO comments for questionable part #s and vendors.
+
+M      templates/avery-iso-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/misc-other-templates.xml
+M      templates/misc-us-templates.xml
+
+commit 79dbb3d7444f6fc13d114dbf4cc7070ced271398
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-24
+
+    Cleanup of template database.
+
+    - Moved "DECAdry" templates to their own file.
+    - Replaced some deprecated "Alias" tags.
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+M      templates/avery-iso-templates.xml
+A      templates/decadry-iso-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/zweckform-iso-templates.xml
+
+commit 71819034a8140dcad8731d9095f018d683b27340
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-24
+
+    Cleanup of template database.
+
+    - Moved "Herma" templates to their own file.
+    - Replaced some deprecated "Alias" tags.
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+M      templates/avery-iso-templates.xml
+A      templates/herma-iso-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/zweckform-iso-templates.xml
+
+commit 9c7681dc51320c27dab08bea3f89c3fbc45946a4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-22
+
+    Added new template file to POTFILES.in
+
+M      po/POTFILES.in
+
+commit f5cfd2233e03d2d2b0d3f4fee300ad3da2f9ca17
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    Added new template file to Makefile.am
+
+M      templates/Makefile.am
+
+commit 3b110fd933a9ab9f666b74e22af9c33827c23a4e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    Removed product_url from JAC templates and added it to vendors.xml
+
+M      templates/jac-iso-templates.xml
+M      templates/vendors.xml
+
+commit 6971f7336af7c5dbfa3fd6a329e7e483983915b2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    Fixed misplaced tags in JAC templates
+
+M      templates/jac-iso-templates.xml
+
+commit 0a8ecfa00185f5cd5a90a01955e26870b48169bf
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    Moved JAC templates to their own file
+
+A      templates/jac-iso-templates.xml
+M      templates/misc-iso-templates.xml
+
+commit 702554106de4ada46d566028a0f768ed6582e88b
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 0586a73c43cda8e82f0198e61164d86b15391452
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-21
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 2391bd0de7d31abc0a3bb5bdf95ae6481e4275eb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-21
+
+    Added confirmation dialog to custom template delete button.
+
+M      src/media-select.c
+
+commit a35071a7dd2b561b6cf479c46639fa62fbefb045
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-20
+
+    Fixed problem with creation of 1st barcode.
+
+    A change signal is apparently being delayed until the actual widget is
+    being realized as a result of the gtk_widget_show of the object editor
+    notebook.  The proper fix is to use actual signal blockers rather than
+    the simple "stop_signals" flag, since the flags assume callbacks are
+    always called inline rather than being called asynchronously.
+
+M      src/object-editor-bc-page.c
+M      src/object-editor.c
+
+commit 860dea63a5a9389d42605bc759892428ad3e94d2
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-20
+
+    Removed pre-libglbarcode artifacts.
+
+M      po/POTFILES.in
+D      src/bc.c
+D      src/bc.h
+
+commit 86f26962cab620b73bdf6f42dcd9ebb31e58ab82
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-11-20
+
+    Updated Spanish translation
+
+M      help/es/es.po
+M      po/es.po
+
+commit 3d7aa37f0eba1c52a959e07b4e53efb8377b838a
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-18
+
+    Documentation cleanup.
+
+    Bug sf#3110768: duplicate choice in editprop.page.
+    Bug sf#3110794: incorrect wording in customize.page.
+    Bug sf#3110801: incorrect wording in customize.page.
+    Bug sf#3110918: docbook artifacts in link tags in createnew.page.
+    Bug sf#3110930: misplaced <credit></credit> tags in about.page.
+    Bug sf#3111019: spelling mistake in editprop.page.
+
+M      help/C/about.page
+M      help/C/createnew.page
+M      help/C/customize.page
+M      help/C/editprop.page
+
+commit b1fd31ae78a8dd346fb48d7f7588274b68820179
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-16
+
+    Cleanup of mancreate.page.
+
+    Bug sf#3110232: Remove docbook artifacts (replaced docbook tags w/
+    mallard tags.
+    Bug sf#3110286: Fixed cut&paste error.
+    Bug sf#3110291: Fixed spelling mistake (height, not heigth).
+
+M      help/C/mancreate.page
+
+commit 8f7f0191cb2f4962064a62b240eed926b150df17
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-15
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 76fd27c54a401448d1795491e958f8b379bc20ab
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-15
+
+    Fixed typo
+
+M      data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+
+commit 99f337b4c2de88c4cfaf3cc9def3253484ab2c39
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-15
+
+    Removed last addition again
+
+M      po/POTFILES.in
+
+commit fdf16d572cd58dcf8e8d3b18e2bf68b7583225c4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-15
+
+    Added another missing filename to POTFILES.in
+
+M      po/POTFILES.in
+
+commit 94b0bf095d42e68c3d6dea64cac99f87964a11e4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-15
+
+    Added missing filename to POTFILES.in
+
+M      po/POTFILES.in
+
+commit 9453143c64d5bbfde9c156c3b5a379eeb124f863
+Merge: 61404cf 6e743df
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-14
+
+    Merge branch 'gtk3'
+
+commit 6e743df0f244177ac9e503c6114b344e0052b71c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-14
+
+    Fixed stupid typo.
+
+    Must of been temporary insanity.  I had replaced a g_unlink with
+    a g_free
+    a while back.  Hanging my head in shame.
+
+M      libglabels/db.c
+
+commit f29bc31c9132bc604d60d7c96cac6b0ef5056a74
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-14
+
+    Fixed typo.
+
+M      src/template-designer.c
+
+commit 52446a0a719433f54f4983aabbc9caff685797c7
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-14
+
+    Make sure merge source is shown.
+
+M      data/ui/merge-properties-dialog.ui
+M      src/merge-properties-dialog.c
+
+commit 61404cf7270a415c3ed1a185dcefd905bde8dc07
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-14
+
+    Added some more JAC templates
+
+M      templates/misc-iso-templates.xml
+
+commit 92965dc1eafa2019bd2c69e921c499eb734cc8d9
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-14
+
+    Added some JAC templates
+
+M      templates/misc-iso-templates.xml
+
+commit 88f44555402d9a405cbbff6ac57bb463e2ee18f0
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-12
+
+    Fix for some gtk3 widget layout issues.
+
+M      data/ui/object-editor.ui
+M      src/ui-sidebar.c
+
+commit e29469011998fbbabe950f4ead5b9b081aeb6375
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-11
+
+    Remove artifacts from old manual.
+
+D      help/C/glabels-3.0.xml
+D      help/C/legal.xml
+M      help/Makefile.am
+M      src/ui-commands.c
+
+commit 45b59e5b4316338dde419f17a3fdb88575b6de02
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-10
+
+    Update licensing information.
+
+    - Docs are now licensed by the CC Attribution-Share Alike 3.0
+    Unported license
+    - Libglbarcode is relicensed by the LGPL3+
+
+M      COPYING-DOCS
+R100   COPYING-LIBGLABELS      COPYING-LIBS
+M      COPYING.README_FIRST
+M      libglbarcode/lgl-barcode-code39.c
+M      libglbarcode/lgl-barcode-code39.h
+M      libglbarcode/lgl-barcode-create.c
+M      libglbarcode/lgl-barcode-create.h
+M      libglbarcode/lgl-barcode-onecode.c
+M      libglbarcode/lgl-barcode-onecode.h
+M      libglbarcode/lgl-barcode-postnet.c
+M      libglbarcode/lgl-barcode-postnet.h
+M      libglbarcode/lgl-barcode-render-to-cairo.c
+M      libglbarcode/lgl-barcode-render-to-cairo.h
+M      libglbarcode/lgl-barcode-type.h
+M      libglbarcode/lgl-barcode.c
+M      libglbarcode/lgl-barcode.h
+
+commit eda073e8e2563046b8c199372033d013a4697f25
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-09
+
+    Yet another logo update.
+
+M      data/pixmaps/glabels-logo.png
+M      help/C/figures/glabels-logo.png
+M      help/C/index.page
+
+commit c57137558f60775a8a2205e127c2079f286d4625
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-09
+
+    Use GtkComboBoxText
+
+M      data/ui/media-select.ui
+M      data/ui/merge-properties-dialog.ui
+M      data/ui/object-editor.ui
+M      data/ui/template-designer.ui
+M      src/combo-util.c
+M      src/combo-util.h
+M      src/media-select.c
+M      src/merge-properties-dialog.c
+M      src/object-editor-bc-page.c
+M      src/object-editor-private.h
+M      src/object-editor.c
+M      src/print-op-dialog.c
+M      src/template-designer.c
+
+commit 52214490bb8d25cd754cb40a274ac9ff36ba60d3
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-11-09
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit d405bc913b1d7d23ff12f92f6ef6323d15a4610d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-11-07
+
+    Initial documentation for libglbarcode.
+
+M      .gitignore
+M      configure.ac
+M      docs/Makefile.am
+A      docs/libglbarcode/Makefile.am
+A      docs/libglbarcode/intro.sgml
+A      docs/libglbarcode/libglbarcode-3.0-docs.sgml
+A      docs/libglbarcode/libglbarcode-3.0-overrides.txt
+A      docs/libglbarcode/libglbarcode-3.0-sections.txt
+A      docs/libglbarcode/libglbarcode-3.0.types
+A      docs/libglbarcode/tmpl/lgl-barcode-create.sgml
+A      docs/libglbarcode/tmpl/lgl-barcode-render-to-cairo.sgml
+A      docs/libglbarcode/tmpl/lgl-barcode-type.sgml
+A      docs/libglbarcode/tmpl/lgl-barcode.sgml
+A      docs/libglbarcode/tmpl/libglbarcode-3.0-unused.sgml
+M      libglbarcode/lgl-barcode-create.c
+M      libglbarcode/lgl-barcode-render-to-cairo.c
+M      libglbarcode/lgl-barcode-type.h
+M      libglbarcode/lgl-barcode.c
+M      libglbarcode/lgl-barcode.h
+M      libglbarcode/libglbarcode-3.0.pc.in
+M      libglbarcode/libglbarcode.h
+
+commit ff1457fe9ff2f87815dcbbdc927f409a0a20a1fd
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-11-03
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 57f251a8d3ef3592e0856eb3c8916ca7c464f324
+Author: Bruno Brouard <annoa.b@gmail.com>
+Date:  2010-11-01
+
+    Updated French translation
+
+M      po/fr.po
+
+commit b8fc8ef5359af7b42d3bd0493c1adcf8236086db
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-11-01
+
+    Added ca@valencia to LINGUAS
+
+M      po/LINGUAS
+
+commit 81941432d20338b56011444017b01799320a6e97
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-31
+
+    Refinements to barcode objects
+    - Draw outline around barcode objects.
+    - Use a more sophisticated test for determining if cursor is on
+    a barcode
+      object: test against lines and glyphs instead of simple bounds
+      test. The
+      test will also indicate that cursor is on the object if it is on the
+      selection outline.  Similar to text objects.
+
+M      libglbarcode/lgl-barcode-render-to-cairo.c
+M      libglbarcode/lgl-barcode-render-to-cairo.h
+M      src/label-barcode.c
+
+commit 9c8e77f5735b97af445de3a5a8926535535c10f8
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-31
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 576d435eba3d25c70329798a29ce99b7934b0582
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-31
+
+    Removed introduction.page
+
+D      help/C/introduction.page
+
+commit 9da0eeeabc8554a3e84a4718fe08c43ec4848333
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-31
+
+    Moved introduction to index.page
+
+M      help/C/index.page
+
+commit ba922c500a1875be6abd70cbacf946a00d375c2b
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-31
+
+    Added names of new files
+
+M      po/POTFILES.in
+
+commit 3f4f1213f12fc5be87547cfb82239c3f9c32c19f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-31
+
+    Removed names of no longer existing files
+
+M      po/POTFILES.in
+
+commit 411560a0b6eb8057add9b6862bc477cb00600e14
+Author: Carles Ferrando <carles.ferrando@gmail.com>
+Date:  2010-10-31
+
+    [l10n] Added Catalan (Valencia) translation
+
+A      po/ca@valencia.po
+
+commit edaa3e0b6dec8f8ba81c05b5a196a90b1ebb1ca2
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-30
+
+    Refactored core barcode subsystem.
+
+    - Created new libglbarcode library
+    - Moved core barcode structure into library
+    - Moved cairo rendering of barcode into library
+    - Moved built-in barcodes to library
+    - Resurrected Code39 support (from wayback in glabels 0.1.x)
+
+    - Backend "glue" remains in glabels proper
+
+M      .gitignore
+M      Makefile.am
+M      configure.ac
+A      libglbarcode/Makefile.am
+A      libglbarcode/lgl-barcode-code39.c
+C076   src/bc-iec18004.h       libglbarcode/lgl-barcode-code39.h
+A      libglbarcode/lgl-barcode-create.c
+C060   src/bc-iec18004.h       libglbarcode/lgl-barcode-create.h
+R085   src/bc-onecode.c        libglbarcode/lgl-barcode-onecode.c
+C064   src/bc-onecode.h        libglbarcode/lgl-barcode-onecode.h
+A      libglbarcode/lgl-barcode-postnet.c
+C060   src/bc-onecode.h        libglbarcode/lgl-barcode-postnet.h
+A      libglbarcode/lgl-barcode-render-to-cairo.c
+C075   src/bc-onecode.h        libglbarcode/lgl-barcode-render-to-cairo.h
+R063   src/bc-onecode.h        libglbarcode/lgl-barcode-type.h
+A      libglbarcode/lgl-barcode.c
+A      libglbarcode/lgl-barcode.h
+A      libglbarcode/libglbarcode-3.0.pc.in
+R067   src/bc-postnet.h        libglbarcode/libglbarcode.h
+M      src/Makefile.am
+M      src/bc-backends.c
+M      src/bc-backends.h
+A      src/bc-builtin.c
+C087   src/bc-iec18004.h       src/bc-builtin.h
+M      src/bc-gnubarcode.c
+M      src/bc-gnubarcode.h
+M      src/bc-iec16022.c
+M      src/bc-iec16022.h
+M      src/bc-iec18004.c
+M      src/bc-iec18004.h
+D      src/bc-postnet.c
+M      src/bc-zint.c
+M      src/bc-zint.h
+M      src/label-barcode.c
+
+commit 227f04fc6321c2e05aa216cafcac42d6c682a83f
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-10-28
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit c9171d11050f595055ba17e53a906e27ad8d28d0
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-10-28
+
+    Update Czech translation by Marek Cernocky
+
+M      po/cs.po
+
+commit ebd747a78e20c7839bc05dfccbae19730772d2c2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-26
+
+    Removed dupicate name
+
+M      AUTHORS
+
+commit 8018996159a5af3bb20149c6eb9f327367dd50d9
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-26
+
+    Added missing name for template contributor
+
+M      AUTHORS
+
+commit f8a80d9fb9e73780c408971458be49affec9ba3c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-25
+
+    Tweak template designer.
+
+    - Added figure for ellipse size page.
+    - Removed translatable attribute to "ellipse_page" label which
+    is never
+      exposed to the user interface.
+
+M      data/pixmaps/Makefile.am
+A      data/pixmaps/ex-ellipse-size.png
+M      data/ui/template-designer.ui
+
+commit d04b523c567a0961a6378921d1ec6adfa810ff71
+Author: Daniel Nylander <po@danielnylander.se>
+Date:  2010-10-25
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit 002b014d22c4ab4e655a53e4382db94aee637a56
+Author: Daniel Nylander <po@danielnylander.se>
+Date:  2010-10-25
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit b6c503e318bb31b37e83100975ca4795553cb50f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-25
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 5f3fe187983bddfe3f74eb9b2b5fd9654e827741
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-10-25
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit a1a1ba75805a6b52d44edca62f1a46758f5edcef
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-24
+
+    Added support for elliptical labels to template designer.
+
+M      data/ui/template-designer.ui
+M      src/template-designer.c
+
+commit edb718146f4462962f7f8d945e3f4e94a267e128
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-24
+
+    Added JAC 987349 template
+
+M      templates/misc-iso-templates.xml
+
+commit 655d3876f4dc85d543757da4ddcb5a7f859d5d68
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-24
+
+    [i18n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 123e40341b75ed9908bf8efe93e7730e8ad7bcd3
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-24
+
+    Fixed some bad formattings in page files
+
+M      help/C/about.page
+M      help/C/mancreate.page
+M      help/C/merge-ex1.page
+M      help/C/merge-ex2.page
+M      help/C/merge-ex3.page
+M      help/C/multifile.page
+
+commit 9e1ffae4ad71013013ffda810938560270aeb0a9
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-24
+
+    [i18n] Updated German doc translation
+
+M      help/de/de.po
+
+commit e76ba5917c22a48071dbfd7ca1d57dd15aecc33e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-24
+
+    [i18n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 6c64505b7ff37d2f07768509f8c0ea47d37a04c7
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-23
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit e1a86d815851f2d9ea8ab8986779d9b5f2d942e5
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-23
+
+    Added note about rotating objects.
+
+M      help/C/editprop.page
+
+commit 45a1bf10d41bc020a9e8438d2bd49d9383ef537e
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-23
+
+    Updated glabels logo yet again.
+
+    Updated logo based on the new-label-dialog image rather than the
+    simple
+    "gLabels" text which is more appropriate for a web-page title rather
+    than a graphical logo which always sits next to the text "glabels"
+    anyway.
+
+M      data/pixmaps/glabels-logo.png
+M      help/C/figures/glabels-logo.png
+
+commit d57e4b8adf4369742323f2a8098cdd996a8c0b99
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-06-10
+
+    Updated German doc translation
+
+M      help/de/de.po
+
+commit f0459b79dae33f354121d4b9d3138e63bfc1a93e
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-09
+
+    Extended introduction
+
+    Extended introduction and moved to its own page.
+    Added logo for index page (used current web logo for now).
+
+A      help/C/figures/glabels-logo.png
+A      help/C/figures/introduction-glabels-main-window.png
+M      help/C/index.page
+A      help/C/introduction.page
+
+commit e88a0125b560cbdd3fcc2eb9e991fae45555013f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-31
+
+    Updated manual template creation page.
+
+    Updated text to reflect changes in current development version of
+    glabels.  Updated and added figures.
+
+A      help/C/figures/glabels-template-cd-label.png
+D      help/C/figures/glabels-template-cd.png
+A      help/C/figures/glabels-template-circle-label.png
+A      help/C/figures/glabels-template-ellipse-label.png
+D      help/C/figures/glabels-template-label.png
+M      help/C/figures/glabels-template-layout.png
+A      help/C/figures/glabels-template-rect-label.png
+M      help/C/mancreate.page
+
+commit 5325e8976aeb992aebe7d1f725fdcb9ee4d0df2d
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-30
+
+    Added missing filename for page file in Makefile.am
+
+M      help/Makefile.am
+
+commit 6a502e49f1219d69fdd1a9ac38263cdbb05f2944
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-29
+
+    Added page on skipping empty address fields.
+
+M      help/C/about.page
+A      help/C/figures/skip-fields-output.png
+A      help/C/figures/skip-fields-screenshot.png
+A      help/C/skipfields.page
+
+commit 3c8c219808431f0e4b3054ca7011a50196048a86
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-28
+
+    Fixed bug in Makefile.am
+
+M      help/Makefile.am
+
+commit a963feda67b0b24510679fdfeb66631fdc5fc36d
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-28
+
+    Added new filenames to Makefile.am
+
+M      help/Makefile.am
+
+commit c8cc8d439836b01b925067e15f3f5cda60c606b8
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-28
+
+    Changed license to Creative Commons
+
+M      help/glabels-3.0.omf.in
+
+commit 073fcd34a90b522980a96d7a1b41f1be3ccdee08
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-28
+
+    Added page files for the new manual
+
+A      help/C/about.page
+A      help/C/basicusage.page
+A      help/C/createnew.page
+A      help/C/customize.page
+A      help/C/customtemplate.page
+A      help/C/editprop.page
+A      help/C/index.page
+A      help/C/labelprop.page
+A      help/C/license.page
+A      help/C/mancreate.page
+A      help/C/merge-ex1.page
+A      help/C/merge-ex2.page
+A      help/C/merge-ex3.page
+A      help/C/merge-ex4.page
+A      help/C/merge.page
+A      help/C/mergefeatures.page
+A      help/C/multifile.page
+A      help/C/newlabel.page
+A      help/C/printfile.page
+A      help/C/select.page
+
+commit b071ef81f3bb86f042a317dd509b10f2f52aaefb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-22
+
+    Added native OneCode barcode backend.
+
+M      src/Makefile.am
+M      src/bc-backends.c
+A      src/bc-onecode.c
+A      src/bc-onecode.h
+
+commit 4ccc7568162606b01eda07d20b1c6f3596a18250
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2010-10-22
+
+    Added sl for Slovenian translation
+
+M      help/Makefile.am
+
+commit 8db3ca50ad72ff6f748c7025b94b6dd9228c0088
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2010-10-22
+
+    Added Slovenian translation
+
+A      help/sl/sl.po
+
+commit 8f1058a9430b0f464f2f8bbb5ca7198db06370cf
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-10-21
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 323db1068fec3f9e29b243526532f8db56b083bb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-17
+
+    Do not expand object editor vertically.
+
+    Gtk3 has new behavior for expansion of widgets.  This commit takes
+    care of
+    the most obvious case of this new behavior.  Additional cases still
+    need to
+    be addressed in the object-editor.ui file.
+
+M      src/ui-sidebar.c
+
+commit 6560b886953a6147b9cd4bca2f797c694fb18f2d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-17
+
+    Removed gtk_status_bar_set_has_resize_grip().
+
+    Resize grip in Gtk3 has been moved from GtkStatusBar to GtkWindow.
+    Glabels
+    also no longer explicitly turns the resize grip off.
+
+M      src/window.c
+
+commit d70695c6d164015b9502592107e256b7bc020a88
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-10-15
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 7e864db86631552f49edd0b014fb197e75d6007f
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-10-11
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit b2b3f6be7f95887f10f9bd7d64b0251f4cef1f70
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-10
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit 0faa416ed1eae948d13d23269fba55ed04bfbea4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-10-10
+
+    Added some new templates
+
+M      templates/pearl-iso-templates.xml
+
+commit e4f1404d031e896bf56e9ac857a913110b4e1477
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-05
+
+    Cleanup of chain button.
+
+    - Convert to new drawing model for bracket lines
+    - Use "changes-allow" and "changes-prevent" lock images
+    - Use toggle button to indicate state (in addition to image)
+
+M      data/ui/object-editor.ui
+M      src/object-editor-size-page.c
+M      src/wdgt-chain-button.c
+
+commit 799a7f4911e9abd575c2b7683750aeca1b905ca8
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-04
+
+    Fix drawing problems with view.c
+
+    - Create separate cairo_t from bin_window and draw into it.
+    - For manual updates, create allocation rectangle manually
+
+M      .gitignore
+M      src/view.c
+
+commit dd7c11af6233329e7f0a05947167dfd8debc3dea
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-03
+
+    Initial port to GTK3.
+
+    Still has update and drawing problems with view.c.
+
+M      configure.ac
+M      src/Makefile.am
+M      src/color-swatch.c
+A      src/cursors/Makefile.am
+A      src/cursors/cursor_barcode.png
+A      src/cursors/cursor_box.png
+A      src/cursors/cursor_ellipse.png
+A      src/cursors/cursor_image.png
+A      src/cursors/cursor_line.png
+A      src/cursors/cursor_text.png
+M      src/font-sample.c
+M      src/media-select.c
+M      src/merge-properties-dialog.c
+M      src/mini-label-preview.c
+M      src/mini-preview.c
+M      src/prefs-dialog.c
+M      src/view-barcode.c
+M      src/view-box.c
+M      src/view-ellipse.c
+M      src/view-image.c
+M      src/view-line.c
+M      src/view-text.c
+M      src/view.c
+M      src/wdgt-chain-button.c
+M      src/window.c
+
+commit a0e160ca8b5dd417430b42f1984ed3ceafbca6bd
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-10-02
+
+    Merge changes from gsettings branch.
+
+M      configure.ac
+M      data/Makefile.am
+A      data/schemas/Makefile.am
+A      data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+M      src/color-history-model.c
+M      src/font-history-model.c
+M      src/prefs-model.c
+M      src/template-history-model.c
+M      src/ui.c
+
+commit 2cc9977dd9fb2e069b9dac4439af952c2f2c15ee
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-27
+
+    Better test for libzint.
+
+M      configure.ac
+
+commit 8404402282b56b1bee08f5115bf43c21fa10574e
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-09-26
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 9a9188f05d74896575aaf2060866dbfb20723058
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-09-26
+
+    Added Best Office 75753 template
+
+M      templates/misc-iso-templates.xml
+
+commit 1c886494fe294fd145d7b6234786dbf32b75f6c7
+Author: Antonio Fernandes C. Neto <fernandes@pelivre.org>
+Date:  2010-09-22
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit 3f02585e277e869df63e78dcc538f1b21964e7fe
+Author: Joe Hansen <joedalton2@yahoo.dk>
+Date:  2010-09-19
+
+    Updated Danish translation
+
+M      po/da.po
+
+commit bce03e38fb47839357147cff6526acefc67e313a
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-09-10
+
+    Update Czech translation by Marek Cernocky
+
+M      po/cs.po
+
+commit cacd288f41657322697972dd2c478fbab72e7536
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-09-09
+
+    Fixed small typo
+
+M      src/ui-commands.c
+
+commit aaf2b3ed072e8a9eacbd0f382bd2af62a6072af3
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-09-06
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit aeb33f64541ad5c39bcc62a0fe94cb1e992a63f0
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-05
+
+    Added logo for template designer druid.
+
+M      data/pixmaps/Makefile.am
+A      data/pixmaps/template-designer.png
+M      src/template-designer.c
+
+commit 9667f709d131a52eca55c5a8400f20d4084a1409
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-05
+
+    Manage mimetype icon with other theme friendly icons.
+
+M      data/icons/48x48/Makefile.am
+R100   data/pixmaps/application-x-glabels.png
+data/icons/48x48/mimetypes/application-x-glabels.png
+M      data/pixmaps/Makefile.am
+
+commit 065ffb88346791da881cfed8a06343c6b6e4b50c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-05
+
+    Theme friendly, glabels specific, action icons.
+
+M      configure.ac
+M      data/icons/16x16/Makefile.am
+R100   src/stock-pixmaps/stock_align_bottom_16.png
+data/icons/16x16/actions/glabels-align-bottom.png
+R100   src/stock-pixmaps/stock_align_hcenter_16.png
+data/icons/16x16/actions/glabels-align-hcenter.png
+R100   src/stock-pixmaps/stock_align_left_16.png
+data/icons/16x16/actions/glabels-align-left.png
+R100   src/stock-pixmaps/stock_align_right_16.png
+data/icons/16x16/actions/glabels-align-right.png
+R100   src/stock-pixmaps/stock_align_top_16.png
+data/icons/16x16/actions/glabels-align-top.png
+R100   src/stock-pixmaps/stock_align_vcenter_16.png
+data/icons/16x16/actions/glabels-align-vcenter.png
+R100   src/stock-pixmaps/stock_arrow_16.png
+data/icons/16x16/actions/glabels-arrow.png
+R100   src/stock-pixmaps/stock_barcode_16.png
+data/icons/16x16/actions/glabels-barcode.png
+R100   src/stock-pixmaps/stock_box_16.png
+data/icons/16x16/actions/glabels-box.png
+R100   src/stock-pixmaps/stock_bucket_fill_16.png
+data/icons/16x16/actions/glabels-bucket-fill.png
+R100   src/stock-pixmaps/stock_center_horiz_16.png
+data/icons/16x16/actions/glabels-center-horiz.png
+R100   src/stock-pixmaps/stock_center_vert_16.png
+data/icons/16x16/actions/glabels-center-vert.png
+R100   src/stock-pixmaps/stock_ellipse_16.png
+data/icons/16x16/actions/glabels-ellipse.png
+R100   src/stock-pixmaps/stock_flip_horiz_16.png
+data/icons/16x16/actions/glabels-flip-horiz.png
+R100   src/stock-pixmaps/stock_flip_vert_16.png
+data/icons/16x16/actions/glabels-flip-vert.png
+R100   src/stock-pixmaps/stock_image_16.png
+data/icons/16x16/actions/glabels-image.png
+R100   src/stock-pixmaps/stock_line_16.png
+data/icons/16x16/actions/glabels-line.png
+R100   src/stock-pixmaps/stock_merge_16.png
+data/icons/16x16/actions/glabels-merge.png
+R100   src/stock-pixmaps/stock_properties_16.png
+data/icons/16x16/actions/glabels-object-properties.png
+R100   src/stock-pixmaps/stock_order_bottom_16.png
+data/icons/16x16/actions/glabels-order-bottom.png
+R100   src/stock-pixmaps/stock_order_top_16.png
+data/icons/16x16/actions/glabels-order-top.png
+R100   src/stock-pixmaps/stock_pencil_16.png
+data/icons/16x16/actions/glabels-pencil.png
+R100   src/stock-pixmaps/stock_rotate_left_16.png
+data/icons/16x16/actions/glabels-rotate-left.png
+R100   src/stock-pixmaps/stock_rotate_right_16.png
+data/icons/16x16/actions/glabels-rotate-right.png
+R100   src/stock-pixmaps/stock_text_16.png
+data/icons/16x16/actions/glabels-text.png
+M      data/icons/24x24/Makefile.am
+R100   src/stock-pixmaps/stock_arrow_24.png
+data/icons/24x24/actions/glabels-arrow.png
+R100   src/stock-pixmaps/stock_barcode_24.png
+data/icons/24x24/actions/glabels-barcode.png
+R100   src/stock-pixmaps/stock_box_24.png
+data/icons/24x24/actions/glabels-box.png
+R100   src/stock-pixmaps/stock_bucket_fill_24.png
+data/icons/24x24/actions/glabels-bucket-fill.png
+R100   src/stock-pixmaps/stock_ellipse_24.png
+data/icons/24x24/actions/glabels-ellipse.png
+R100   src/stock-pixmaps/stock_hchain_broken_24.png
+data/icons/24x24/actions/glabels-hchain-broken.png
+R100   src/stock-pixmaps/stock_hchain_24.png
+data/icons/24x24/actions/glabels-hchain.png
+R100   src/stock-pixmaps/stock_image_24.png
+data/icons/24x24/actions/glabels-image.png
+R100   src/stock-pixmaps/stock_line_24.png
+data/icons/24x24/actions/glabels-line.png
+R100   src/stock-pixmaps/stock_merge_24.png
+data/icons/24x24/actions/glabels-merge.png
+R100   src/stock-pixmaps/stock_properties_24.png
+data/icons/24x24/actions/glabels-object-properties.png
+R100   src/stock-pixmaps/stock_pencil_24.png
+data/icons/24x24/actions/glabels-pencil.png
+R100   src/stock-pixmaps/stock_text_24.png
+data/icons/24x24/actions/glabels-text.png
+R100   src/stock-pixmaps/stock_vchain_broken_24.png
+data/icons/24x24/actions/glabels-vchain-broken.png
+R100   src/stock-pixmaps/stock_vchain_24.png
+data/icons/24x24/actions/glabels-vchain.png
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/color-combo-button.c
+M      src/color-combo-button.h
+M      src/glabels.c
+M      src/object-editor.c
+D      src/stock-pixmaps/Makefile.am
+D      src/stock.c
+D      src/stock.h
+M      src/ui-property-bar.c
+M      src/ui-sidebar.c
+M      src/ui.c
+M      src/wdgt-chain-button.c
+
+commit ece7eac613951c98d90cb698497576a110265a21
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-04
+
+    Additional ignore pattern.
+
+M      .gitignore
+
+commit 3fd4017b3e2461638683b3753b96c7484e7d4ed2
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-04
+
+    Theme friendly app icons.
+
+M      configure.ac
+M      data/Makefile.am
+A      data/icons/16x16/Makefile.am
+A      data/icons/16x16/apps/glabels-3.0.png
+A      data/icons/22x22/Makefile.am
+A      data/icons/22x22/apps/glabels-3.0.png
+A      data/icons/24x24/Makefile.am
+A      data/icons/24x24/apps/glabels-3.0.png
+A      data/icons/32x32/Makefile.am
+A      data/icons/32x32/apps/glabels-3.0.png
+A      data/icons/48x48/Makefile.am
+A      data/icons/48x48/apps/glabels-3.0.png
+A      data/icons/Makefile.am
+M      data/pixmaps/Makefile.am
+D      data/pixmaps/glabels-3.0.png
+M      src/Makefile.am
+M      src/glabels-batch.c
+M      src/glabels.c
+M      src/template-designer.c
+
+commit acadb7b8e069be9c8a95502191771b6466ddaedf
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-03
+
+    New logo and tweaking of about dialog.
+
+M      data/pixmaps/Makefile.am
+D      data/pixmaps/glabels-about-logo.png
+A      data/pixmaps/glabels-logo.png
+D      data/pixmaps/glabels-splash.png
+M      src/ui-commands.c
+
+commit 8b85d5b2506945a45411f160ec2d6afc8d184499
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-03
+
+    Removed remaining artifacts from old hig module.
+
+M      data/ui/merge-properties-dialog.ui
+M      po/POTFILES.in
+M      src/Makefile.am
+D      src/hig.h
+M      src/merge-properties-dialog.c
+M      src/prefs-dialog.c
+
+commit de714c6562a0cf92eadc8430da644117e948a422
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-09-03
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit 9e1e6e9b3e8f03a95a949d612e6f6f7846f95a1e
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-09-03
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 05e9418eb30b1702a10a8662c83da7904d60151a
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-02
+
+    Update POTFILES.in after merge and update AUTHORS.
+
+M      AUTHORS
+M      po/POTFILES.in
+
+commit 6c9d844640ff7c481eaa1962aff3bdebd0c2c0ff
+Merge: 7e03137 e681454
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-09-02
+
+    Merge branch 'zint'
+
+commit e68145406dd9ea1326cace7341fa736e8e065bff
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-08-31
+
+    Fix maximum size of object editor sidebar at initialization.
+
+    Kludge:  Load barcode styles for each backend type at initialization,
+    so that
+    when they are loaded for real, the maximum size of the widget has
+    already been
+    established and doesn't cause the object editor to change size.
+
+M      data/ui/object-editor.ui
+M      src/object-editor-bc-page.c
+
+commit a8d633c591f7cb28150ab85ae6b0feac1856335c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-08-31
+
+       Encapsulate barcode style in single struct.
+
+       Encapsulate barcode style into a single struct and related
+       clean-up.
+
+M      src/label-barcode.c
+M      src/label-barcode.h
+M      src/merge-evolution.c
+M      src/merge-text.c
+M      src/merge-vcard.c
+M      src/merge.c
+M      src/merge.h
+M      src/object-editor-bc-page.c
+M      src/object-editor-private.h
+M      src/object-editor.c
+M      src/text-node.c
+M      src/text-node.h
+M      src/xml-label-04.c
+M      src/xml-label.c
+
+commit a6f3364c48c13198e6583701cff3ba8f1e0230aa
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-08-29
+
+    Allow user selection of barcode backend.
+
+    - User can now select which backend to use for a particular barcode.
+    - This prevents one implementation from eclipsing another.
+    - For backwards compatability, do best guess at backend.
+
+M      data/ui/object-editor.ui
+M      src/bc-backends.c
+M      src/bc-backends.h
+M      src/label-barcode.c
+M      src/label-barcode.h
+M      src/object-editor-bc-page.c
+M      src/object-editor-private.h
+M      src/object-editor.c
+M      src/xml-label-04.c
+M      src/xml-label.c
+M      templates/glabels-2.3.dtd
+
+commit 2ef27d0e798c9c6f72c946ed502bc7d670ab4a07
+Author: Robin Stuart <robin@zint.org.uk>
+Date:  2010-08-21
+
+    Added support for Maxicode barcodes using the libzint backend.
+
+M      src/bc-backends.c
+M      src/bc-zint.c
+M      src/bc.c
+M      src/bc.h
+M      src/label-barcode.c
+
+commit 7e031374c3c42b858eb321a5cbaf63ffa7d9cd3e
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-08-18
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit e805759afe8c7c0c410516f387ee76cb37f23827
+Author: Marek Černocký <marek@manet.cz>
+Date:  2010-08-11
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 1f0f30a0aa1e81d2b347d61acdf114d7d4041c64
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-08-08
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 16ac39db3608aed0d6859b8472c32fa1da6fd48b
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-08-06
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit e8c1b3f843997bbdb508e32bd951732ef8ffbc17
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-08-05
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 432cc50d56107d94a59269345df985dd75976ffb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-08-02
+
+    Added user submitted templates.
+
+    Added templates submitted by Rudolph Leitgeb and E. Travis.
+    Also cleaned up
+    avery-iso-templates.xml file.
+
+M      AUTHORS
+M      templates/avery-iso-templates.xml
+M      templates/misc-us-templates.xml
+
+commit 2e156f680d5f563ed3b050dbfe6f6d3d30a5e826
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-14
+
+    Cleanup zint backend settings and flags.
+
+M      src/bc-backends.c
+
+commit b5865243f8cb28214bfed442ee5d7cbee2967bc2
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-11
+
+    More refactoring of barcode subsystem.
+
+    Create a clear separation between the intermediate barcode format and
+    the management of the barcode backends.
+
+M      src/Makefile.am
+A      src/bc-backends.c
+A      src/bc-backends.h
+M      src/bc-gnubarcode.c
+M      src/bc-iec16022.c
+M      src/bc-iec18004.c
+M      src/bc-postnet.c
+M      src/bc-zint.c
+M      src/bc.c
+M      src/bc.h
+M      src/label-barcode.c
+M      src/label-barcode.h
+M      src/object-editor-bc-page.c
+M      src/object-editor.h
+
+commit 6717882e759c320e468683f8c69cf8af1281d91b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-11
+
+    Refactoring of barcode structure.
+
+    Minor refactoring of API to barcode structure.
+
+M      src/bc-gnubarcode.c
+M      src/bc-iec16022.c
+M      src/bc-iec18004.c
+M      src/bc-postnet.c
+M      src/bc-zint.c
+M      src/bc.c
+M      src/bc.h
+M      src/label-barcode.c
+
+commit f6a1818fe2e0975dc664a1863594f3ed371e0937
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-07-10
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 8d2a845d489a74468776034fdab4a2e377ecffaa
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-07-10
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit b012b9c74def1a87e21e678486eeb4debeaf23be
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-10
+
+    Improved centering of barcode text.
+
+    Don't try to calculate x offset using hardcoded fixed character
+    width, which
+    does not work properly for proportional fonts.  Use the origin
+    provided by
+    zint (wich is at the horizontal center) and use pango to calculate
+    the offset
+    at render time.
+
+M      src/bc-zint.c
+M      src/bc.h
+M      src/label-barcode.c
+
+commit 61aa9b8dce8e6143eba39b368897a5f1a39a8e29
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-10
+
+    Update po files to allow me to push this branch.
+
+M      po/ca.po
+M      po/cs.po
+M      po/da.po
+M      po/de.po
+M      po/eo.po
+M      po/es.po
+M      po/fr.po
+M      po/it.po
+M      po/ja.po
+M      po/ko.po
+M      po/nb.po
+M      po/pl.po
+M      po/pt.po
+M      po/pt_BR.po
+M      po/ru.po
+M      po/sl.po
+M      po/sv.po
+M      po/zh_CN.po
+M      po/zh_TW.po
+M      src/Makefile.am
+
+commit e43f6397f295172646ed67456799c1fe6cbfb94a
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-09
+
+    Added new barcode drawing primitives.
+
+    Added a "Box" and a "String" barcode drawing primitives.  The box
+    primitive
+    should be more natural for drawing actual boxes instead of lines.
+    The string
+    primitive allows an entire string to be rendered with a single
+    interaction with
+    pango and cairo, rather than an interaction for each character.
+    There is no
+    need to try to implement kerning since pango will take care of the
+    string as
+    a single layout.
+
+M      src/bc-zint.c
+M      src/bc.c
+M      src/bc.h
+M      src/label-barcode.c
+
+commit f2ced22e6919c5311fb0467e0f07874d9e28e16d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-09
+
+    Fixed width behavior of object editor.
+
+    I had neglected to add the barcode page to the appropriate size
+    group. Longer
+    names in the zint backend caused the style combobox to be the long
+    pole in
+    the tent, causing the width of the object editor to fluctuate when
+    selecting
+    and un-selecting barcode objects.
+
+M      data/ui/object-editor.ui
+
+commit 7e6b5431df2e8eed3152fb33db25c856dfc2a20b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-08
+
+    Revert "Fix for batch output"
+
+    This reverts commit 03d80812158823eb8ad7184d1c7629b64daaecb5.
+
+M      src/label-text.c
+
+commit dd0b78bdd763b8f47b1031b478c6b2b57119fff3
+Author: Sam Lown <me@samlown.com>
+Date:  2010-07-08
+
+    Fix for batch output
+
+M      src/label-text.c
+
+commit 8b662f5b767bb4172e4b1911ecb304bd0b4c5b40
+Author: Sam Lown <me@samlown.com>
+Date:  2010-07-07
+
+    Freeing memory in xml and adding poor mans kerning to bc-zint
+
+M      src/bc-zint.c
+M      src/xml-label.c
+
+commit e9f492c8fc1638bc9a0a7014653e54306c7e974e
+Author: Sam Lown <me@samlown.com>
+Date:  2010-07-07
+
+    Using regexp to remove white space from text instead of detecting
+    newlines in xml
+
+M      src/xml-label.c
+
+commit a3fd97c6757a71f8761f76bb28c356ca425148c2
+Author: Sam Lown <me@samlown.com>
+Date:  2010-07-07
+
+    Getting GS1-128 to behave as expected
+
+M      src/bc.c
+
+commit 9d21b20ed765ef3f924a9ee48158cde94f707022
+Author: Sam Lown <me@samlown.com>
+Date:  2010-07-06
+
+    Adding Robin's changes for latest Zint
+
+M      src/bc-zint.c
+M      src/bc.c
+
+commit f3219c0e3e7800336ac13b8fbd8f62371c2398bb
+Author: Sam Lown <me@samlown.com>
+Date:  2010-06-13
+
+    Provides barcode even if invalid for correct sizing
+
+M      src/bc-zint.c
+
+commit 65dd24369545da8bd2a698fa72f08fac40cd2d37
+Author: Sam Lown <me@samlown.com>
+Date:  2010-06-12
+
+    Minor alteration for GS1-128 length@
+
+M      src/bc.c
+
+commit 769479af3289ee847ccea3145d91d15a80482b69
+Author: Sam Lown <me@samlown.com>
+Date:  2010-06-11
+
+    Updating for Zint strings and fixed dimensions
+
+M      src/bc-zint.c
+M      src/bc.c
+
+commit e1e80392cc40e87cd673e1d55a450d393432c240
+Author: Sam Lown <me@samlown.com>
+Date:  2010-05-30
+
+    Alterations to zint rendering
+
+M      src/bc-zint.c
+
+commit 6220643a6116d965c08e17da3f35acd66698be1d
+Author: Sam Lown <me@samlown.com>
+Date:  2010-05-30
+
+    Modified Zint support to use rendered data rather than encoded
+
+M      src/bc-zint.c
+
+commit b8b660ce6a19fd5c32d2311a6afe873c10f399c2
+Author: Sam Lown <me@samlown.com>
+Date:  2010-05-17
+
+    Forwardporting changes for zint barcode support
+
+M      src/Makefile.am
+M      src/bc-zint.c
+
+commit bc70724dbf60a6d2ee2f393b1252aed167e07823
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-08
+
+    Initialize font-history subsystem in glabels-batch.
+
+M      src/glabels-batch.c
+
+commit 6b6ff9ba800dde3f3954f36743e390dac8200b22
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-07-07
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit 0d5e8e336aa6d3b76470c8b396e442e0e7f2dd83
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-06
+
+    String cleanup.
+
+    Removed pango markup from translatable strings.  Fixed word order
+    assumption
+    with use of standalone "per sheet" string.
+
+M      data/ui/merge-properties-dialog.ui
+M      data/ui/object-editor.ui
+M      data/ui/prefs-dialog.ui
+M      data/ui/print-op-dialog-custom-widget.ui
+M      libglabels/template.c
+M      src/template-designer.c
+
+commit 09b643f62fc415b50a6d85079e0e503b6bd8f2a6
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-06
+
+    Fixed a few -Wall warnings.
+
+M      src/label-image.c
+M      src/svg-cache.c
+
+commit 669df86b2593b4a6ba19b0fa58092f19fabf32b3
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-07-05
+
+    [i18n] Updated German translation
+
+M      po/de.po
+
+commit b2ef908e8f1f0ae8daf7a08a82ff9c3e3128f06d
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-07-04
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 3e365e5f9187a12fbf0e29d4d3804cab0261e8e9
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-07-02
+
+    Add native support for SVG images.
+
+    Rather than just rasterizing SVG files into GdkPixbufs, use RSVG
+    to handle
+    SVG files directly -- preserving the original file as inline data.
+
+M      configure.ac
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/debug.c
+M      src/debug.h
+M      src/file-util.c
+M      src/file-util.h
+M      src/label-image.c
+M      src/label-image.h
+M      src/label.c
+M      src/label.h
+M      src/object-editor.c
+A      src/svg-cache.c
+A      src/svg-cache.h
+M      src/xml-label.c
+M      templates/glabels-2.3.dtd
+
+commit 85c5b1fa0d48486d3985c43cd0272a3d5d0753c7
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-06-16
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 907a32752b637186451c56cc79fa19b35e7e33e2
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-12
+
+    Add shadow property to image objects.
+
+    Added shadow support to image objects.  Shadow is created from
+    the image's
+    alpha channel, so the shadow will work properly for images with
+    transparent
+    backgrounds.  More work needs to be done to better optimize the
+    performance.
+
+M      src/Makefile.am
+M      src/label-image.c
+M      src/object-editor.c
+A      src/pixbuf-util.c
+A      src/pixbuf-util.h
+
+commit 3f4bd5d778015e524870eeb8bf89ad5bd615eabe
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-12
+
+    Cleanup of shadows for boxes and ellipses.
+
+    Do a more intelligent job of drawing shadows for boxes and ellipses.
+    Instead
+    of just blindly drawing a fill shadow and an outline shadow, choose
+    to draw
+    one or the other and adjust size of shadow appropriately.
+
+M      data/ui/object-editor.ui
+M      src/label-box.c
+M      src/label-ellipse.c
+
+commit fe7a2fbf407047c5d69ccc93e9d5a6cb92d08871
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-11
+
+    Do not explicitly set sidebar size.
+
+    Use 2 sizegroups to automatically fix sidebar size based on the size
+    of the widgets it contains -- even hidden ones.  The width was
+    previously
+    set explicitly to prevent the sidebar from changing size whenever
+    objects
+    are selected and unselected.  This has been problematic for
+    compatability
+    with different themes, fonts, and translations.
+
+M      data/ui/object-editor.ui
+M      src/object-editor.c
+M      src/ui-sidebar.c
+
+commit 1382ac85c0d0516a9760db1f52173a6d3f0563e5
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-06-11
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 8aa1c5b131e6ee24c2f1c54be23239f062c91a65
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-06-10
+
+    Updated German translation
+
+M      po/de.po
+
+commit 2dc9de0c566a201d49f436fa6831dec403603f2e
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-09
+
+    Added text merge backend for semicolon separated values
+
+    Feature request #3013910.  Added entry for a text merge backend using
+    a semicolon as delimiter.
+
+M      src/merge-init.c
+
+commit 59eac573a766dce34876713953efd5a147fd0222
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-06
+
+    Some final preparation for 2.3.0.
+
+M      NEWS
+M      configure.ac
+
+commit 245b69b5ed745eea8509133fd5c49a8bdde8082f
+Author: Christian Persch <chpe@gnome.org>
+Date:  2010-06-05
+
+    Speed up large barcodes
+
+    g_list_append() is evil. Just use prepend().
+
+M      src/bc.c
+
+commit 3cc1494b4838d0aa4c6b4fb35f15a80b44a69071
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-05
+
+    Some preparation for 2.3.0 release
+
+M      AUTHORS
+M      NEWS
+M      configure.ac
+
+commit b27f91e7105e2a28ca1f7377d67ee20ccd7ec994
+Author: Michel Recondo <michel@recondo.com.br>
+Date:  2010-06-05
+
+    Updated Brazilian Portuguese translation
+
+    Reviewed by Henrique Machado <hpmachado@gnome.org>
+
+M      po/pt_BR.po
+
+commit 3c200d2279f57999de42fb211ed878de3a62ad5b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-04
+
+    Updated libglabels documentation.
+
+M      docs/libglabels/libglabels-3.0-sections.txt
+M      docs/libglabels/tmpl/category.sgml
+M      docs/libglabels/tmpl/db.sgml
+M      docs/libglabels/tmpl/paper.sgml
+M      docs/libglabels/tmpl/str.sgml
+M      docs/libglabels/tmpl/template.sgml
+M      docs/libglabels/tmpl/units.sgml
+M      docs/libglabels/tmpl/vendor.sgml
+M      docs/libglabels/tmpl/xml-category.sgml
+M      docs/libglabels/tmpl/xml-paper.sgml
+M      docs/libglabels/tmpl/xml-template.sgml
+M      docs/libglabels/tmpl/xml-vendor.sgml
+M      docs/libglabels/tmpl/xml.sgml
+M      libglabels/db.c
+M      libglabels/str.c
+
+commit 424d8c45333504425cebb58d97b1f9e58e45a473
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-02
+
+    Fixed a few -Wall warnings
+
+M      libglabels/db.c
+M      src/file-util.c
+M      src/merge.c
+M      src/str-util.c
+
+commit 10d31988ea2247e420f2622043fb8586bc839ed9
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-06-02
+
+    Updated NEWS for upcoming 2.3.0 release.
+
+M      NEWS
+
+commit a05703c9967c8bca38785a8c4872bf6ab266f57c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-31
+
+    Updated DTD.
+
+M      templates/glabels-2.3.dtd
+
+commit 55b7dda6b69c4f1a25734152fd6b69b72ee3f385
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-30
+
+    Fix selection problem.
+
+    Clear existing paths before creating new test paths.  This would
+    occasionally
+    cause the wrong object to be selected because the in_fill or in_stroke
+    tests would be satisfied using left-over paths from previous tests.
+
+M      src/label-barcode.c
+M      src/label-box.c
+M      src/label-ellipse.c
+M      src/label-image.c
+M      src/label-line.c
+M      src/label-text.c
+
+commit c555edf9c5195b45812383d699e6021417dd96cd
+Author: Joe Hansen <joedalton2@yahoo.dk>
+Date:  2010-05-30
+
+    Updated Danish translation
+
+M      po/da.po
+
+commit 1ce273bf46b7e199600e5332d2ee13a2e4aea241
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-05-30
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 1990055cc0190e23fc0796ff04c00678b68faba3
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-29
+
+    Tweak rendering of color swatches and font samples.
+
+M      src/color-swatch.c
+M      src/font-sample.c
+
+commit 06f27cce690f6ee0a498a05ae16d4eeb96cf20c1
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-29
+
+    Explicitly link with libm.
+
+M      src/Makefile.am
+
+commit 1d85e165dcfedb28327b8e79bd91bdbb02e1f6e6
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-05-28
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit bb8763ff8f3d739280dafbde15e27622fa08148a
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-05-28
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 88decad7363f3e3d13ca34fd6e956ed9bd197a11
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2010-05-27
+
+    Updated French translation
+
+    Contributed by Claude Paroz and Gérard Baylard
+
+M      po/fr.po
+
+commit 26990ef637b55a385c9b61308bc6ecbb9234334b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-26
+
+    Some minor barcode cleanup
+
+    - Added DEBUG_BARCODE so that verbosity on stdout of new libzint
+    backend
+      can be controlled.
+    - Removed artifact comments and some minor formatting changes
+    in libzint
+      backend.
+    - In object editor, make preview format track the number of digits
+    in the
+      digits spinbox in real-time.
+
+M      src/bc-zint.c
+M      src/bc.c
+M      src/debug.c
+M      src/debug.h
+M      src/object-editor-bc-page.c
+
+commit c22727a27e8ab935eeaf4ef2a0d5119212597406
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2010-05-26
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 4071ed90076bb15c831435063b2b6bce0cbbe00e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-25
+
+    Updated German translation
+
+M      po/de.po
+
+commit 29d57a7936c1d39db31fd5e952bda32f13331ac1
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-24
+
+    Additional translator hints.
+
+    - Fixed a couple of strings that should not have been marked
+    translatable.
+    - Added comments for "Fixed", "Other", "None", and "No match."
+    - Attempted to disambiguate 3 different occurances of "Any"
+
+M      data/ui/new-label-dialog.ui
+M      data/ui/object-editor.ui
+M      libglabels/db.c
+M      libglabels/template.c
+M      src/media-select.c
+M      src/merge-properties-dialog.c
+M      src/merge.c
+
+commit eb650e1275a4a9f54ef05c97933646ec37fc7d56
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-24
+
+    Use a translator comment rather than context.
+
+M      src/mini-preview.c
+
+commit d9f004626ba7f8a8870c3265c89863b569357556
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-24
+
+    Added context for "Up" string
+
+M      src/mini-preview.c
+
+commit 51181713e931b531cb595dffe2c7fc742155b687
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-24
+
+    Removed "translatable" attribute from unused builder strings
+
+    Removed "translatable" attribute from unused builder strings.
+    These strings
+    are an artifact of how I organized the individual pages for
+    GtkAssistants
+    in GtkNotebooks in glade.
+
+M      data/ui/new-label-dialog.ui
+M      data/ui/template-designer.ui
+
+commit 21115bdb38a0b6ffc93cfa6c6611dc071cb3812a
+Author: Takeshi AIHANA <takeshi.aihana@gmail.com>
+Date:  2010-05-24
+
+    Updated Japanese translation, taken from the 2_2 branch
+
+M      po/ja.po
+
+commit b039cb00f971a74d9add15fbeecadfa37de698f7
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-24
+
+    Updated German translation
+
+M      po/de.po
+
+commit 3144ddc46eea2ac6e74887a6229981491da10aa0
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-24
+
+    Made PEARL label descriptions translatable
+
+M      po/POTFILES.in
+
+commit b0ef76a570d6af52af44dbe0014ebe559720058c
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-24
+
+    Added more labels
+
+M      templates/pearl-iso-templates.xml
+
+commit 0c89cdc382cd774da88e0b065fc0b6851aacbdf1
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-24
+
+    Properly mark strings as no-c-format
+
+    Properly mark non-c-format strings containing '%' as no-c-format.
+     - Added "xgettext: no-c-format" comments as suggested by Claude
+     Paroz.
+     - Removed backslashes ('\') from my ignorant attempt to address this.
+
+M      src/color-combo-menu.c
+
+commit 30d4df7681459d895ef5c09e2e43ba88c0e72785
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-22
+
+    Minor refactoring of glBarcode structure.
+
+    Minor refactoring of glBarcode structure in preparation of support for
+    more exotic barcode shapes.
+
+M      src/bc-gnubarcode.c
+M      src/bc-iec16022.c
+M      src/bc-iec18004.c
+M      src/bc-postnet.c
+M      src/bc-zint.c
+M      src/bc.c
+M      src/bc.h
+M      src/label-barcode.c
+
+commit ee2801d56d29e847b90849f95a14e2cab518718d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-17
+
+    Autosize zint barcode when w == 0 && h == 0.
+
+M      src/bc-zint.c
+
+commit 0f73f8658931299b97a4e9126622014e7d86e9ed
+Author: Sam Lown <me@samlown.com>
+Date:  2010-05-17
+
+    Added libzint as a barcode backend.
+
+    Added libzint as a barcode backend.  Currently only implements the
+    GS1-128 barcode.
+
+M      configure.ac
+M      src/Makefile.am
+A      src/bc-zint.c
+A      src/bc-zint.h
+M      src/bc.c
+
+commit 94475149f8f8568f62723cb2428ce11d76243f1b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-16
+
+    Allow for small error in comparison of dimensions.
+
+    In lgl_template_are_templates_identical(), allow for a small
+    error when
+    comparing dimensions.  Set EPSILON to 0.5pt, which is aproximately
+    0.007in or 0.2mm.
+
+M      libglabels/template.c
+
+commit a4d7958651c3cd53424b8ca74b314b8bd71a055f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-15
+
+    Use g_get_user_config_dir() to locate custom templates.
+
+    Use g_get_user_config_dir() to locate custom template.  By default
+    this
+    means that custom templates will be stored at
+    ~/.config/libglabels/templates
+    instead of ~/.glabels.
+
+    Also automatically migrate user custom templates to the new location
+    when
+    run for the first time.
+
+M      libglabels/Makefile.am
+M      libglabels/db.c
+M      libglabels/libglabels-private.h
+
+commit a8fe0a4371351910d70fc66f71b347ba904fafa0
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-15
+
+    Update TODO file.
+
+M      TODO
+
+commit 25a0745280c5b37d702bca540a0bc1f78ac8270e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-15
+
+    Updated German translation
+
+M      po/de.po
+
+commit 634f1afa97ecae4589fb82d130de78b0b2724db0
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-05-15
+
+    Fixed filenames in POTFILES.in
+
+M      po/POTFILES.in
+
+commit 25af4f2b739108625226db78aebe4b206535bacb
+Author: Daniel Mustieles <danielmustieles@gmail.com>
+Date:  2010-05-15
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit d88c0c2aa50950095fbff6fef46732d586333522
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-12
+
+    Renamed builder files to use '.ui' extension.
+
+M      configure.ac
+M      data/Makefile.am
+D      data/builder/Makefile.am
+A      data/ui/Makefile.am
+R100   data/builder/media-select.builder       data/ui/media-select.ui
+R100   data/builder/merge-properties-dialog.builder
+data/ui/merge-properties-dialog.ui
+R100   data/builder/new-label-dialog.builder
+data/ui/new-label-dialog.ui
+R100   data/builder/object-editor.builder      data/ui/object-editor.ui
+R100   data/builder/prefs-dialog.builder       data/ui/prefs-dialog.ui
+R100   data/builder/print-op-dialog-custom-widget.builder
+data/ui/print-op-dialog-custom-widget.ui
+R100   data/builder/property-bar.builder       data/ui/property-bar.ui
+R100   data/builder/template-designer.builder
+data/ui/template-designer.ui
+M      src/media-select.c
+M      src/merge-properties-dialog.c
+M      src/new-label-dialog.c
+M      src/object-editor.c
+M      src/prefs-dialog.c
+M      src/print-op-dialog.c
+M      src/template-designer.c
+M      src/ui-property-bar.c
+
+commit 4d51e31d5f526b0885b25be6f94624e5ea4ff1f7
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-11
+
+    Reconciled font size limits in separate spinboxes.
+
+M      data/builder/object-editor.builder
+
+commit f470b3aa6484c6c56cc98d451c6f57708aaf4d53
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-10
+
+    Refinements to text objects
+
+    - Draw outline around text objects.
+    - Use a more sophisticated test for determining if cursor is on a text
+      object: test against glyphs instead of simple bounds test.
+      The test will
+      also indicate that cursor is on the object if it is on the
+      selection outline.
+    - Do word wrap instead of character wrap.
+
+M      src/label-text.c
+
+commit edff98c6ae5250858a3e376a992ba84265a93d6c
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-07
+
+    Added several vendor URLs.
+
+M      templates/vendors.xml
+
+commit 206b483f611441d18db5360800975f2f0d35014b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-05
+
+    Added sanity tests to template parser
+
+    When parsing a template node, if there is no recognized frame node
+    (e.g.
+    Label-rectangle), a default full-page frame with a 1x1 layout
+    is created.
+    Likewise, if a frame has no layout, a default 1x1 layout is created.
+    This prevents potential crashes due to typos in the case of typos in
+    hand generated templates.
+
+M      libglabels/str.c
+M      libglabels/xml-template.c
+
+commit 6509948cb27c7c76349350e1b84aaaf4a52c7e59
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-02
+
+    Added Avery 8658 family of templates.
+
+    Added Avery 8658 family of templates, submitted by Nigel Titley.
+
+M      templates/avery-iso-templates.xml
+
+commit 7d926a37cc8956753d610140fc301b845e3a7de9
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-02
+
+    Do a better job of rounding in lgl_str_format_fraction().
+
+    When a number is determined to be "close enough" to being an integer,
+    don't
+    just simply cast the number to get the integer value.
+
+M      libglabels/str.c
+
+commit 8df8aedaf99f072cb2739fbbdcfa3440acd415eb
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-05-01
+
+    Removed obsolete workaround.
+
+    Removed obsolete workaround for Pango Bug#341481.  This is now
+    fixed in
+    recent versions of Pango.
+
+M      src/label-text.c
+
+commit 8fb4c72166b2052b31bc9b5f02e63c6ae5886a82
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-29
+
+    Minor Cleanup
+
+M      libglabels/db.c
+M      src/new-label-dialog.c
+
+commit e322da91fe4a9bdabbc35e1e146e1dada04d6288
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-25
+
+    Added "Up" label to orientation arrow.
+
+    Added an "Up" label to the orientation arrow in the 1st label in the
+    mini preview.  Use theme base color for arrow and label.  Don't draw
+    arrow if w == h.
+
+M      src/mini-preview.c
+
+commit 7381cfd88fa386dc1fc3a7cce0d0aaac9c4dce45
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-21
+
+    Added test for duplicate templates
+
+    Added test for duplicate pre-defined templates.  Removed duplicate
+    template in pearl-iso-templates.xml.  Also added lgl_template_print()
+    for
+    debugging purposes.
+
+M      libglabels/db.c
+M      libglabels/template.c
+M      libglabels/template.h
+M      templates/pearl-iso-templates.xml
+
+commit 0633489db60773e6e61914d978d9f64bae0fbf13
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-20
+
+    Added decorations to "new label" dialog
+
+    Added new images to decorate each page of the "new label"
+    dialog/wizard.
+
+M      data/pixmaps/Makefile.am
+A      data/pixmaps/new-confirm.png
+A      data/pixmaps/new-rotate.png
+A      data/pixmaps/new-select.png
+M      src/new-label-dialog.c
+
+commit 58982c93787c62d55e343f6b316643fe5d4f05d6
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-18
+
+    Added ability to edit user-defined templates
+
+M      libglabels/db.c
+M      libglabels/db.h
+M      src/media-select.c
+M      src/mini-preview-pixbuf-cache.c
+M      src/mini-preview-pixbuf-cache.h
+M      src/template-designer.c
+M      src/template-designer.h
+
+commit 08f8cffbc138c302c502b08c4464462d19532bcf
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-04
+
+    Changed packing style for media select widget
+
+    Changed packing style for media select widget so that it will expand
+    both horizontally and vertically with new label dialog.
+
+M      data/builder/media-select.builder
+M      data/builder/new-label-dialog.builder
+
+commit 3ebe5807c5895cd9ca91233813ad11a9a0916698
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-03
+
+    Allow "new label" and "properties" dialogs to be resizable.
+
+M      src/file.c
+
+commit 1404fad764041cd32b156e43fb3a6417d9e140d9
+Author: Filipe Roque <fliproque@gmail.com>
+Date:  2010-04-04
+
+    Updated Portuguese translation
+
+M      po/LINGUAS
+A      po/pt.po
+
+commit 253e63d0a170859aeae433afb94c8df9908f2e92
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-04-03
+
+    Added Avery DL33 and look-alike templates.
+
+    DL33 templates provided by Ian Shuttleworth.
+
+M      AUTHORS
+M      templates/avery-iso-templates.xml
+M      templates/misc-iso-templates.xml
+
+commit 8bbf05ef33758514b23fdd31ed5b0e4d5f128396
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-31
+
+    Fixed selection problem with media select widget
+
+    Fixed selection problem with media select widget by removing cut&paste
+    artifact from last update to this widget.
+
+M      src/media-select.c
+
+commit 712fd7eb1a39500a22196feef726d4fb26cf1acb
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-03-29
+
+    Updated German translation
+
+M      po/de.po
+
+commit 07cc165a7d57312cffee8b56a318fe4a597cdb83
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-28
+
+    Added "custom" tab to media select widget
+
+    Added "custom" tab to media select widget. In this tab, the user can
+    launch the template designer or delete an existing user-defined
+    template.
+    Added notification callbacks to libglabels db subsystem so that the
+    media select widget will automatically update when user-defined
+    templates
+    are added or deleted.  The "edit" button does not do anything yet.
+
+    Also did some visual cleanup to the new label dialog.
+
+    Also include ../libglabels in SUBDIRS in src/ so that libglabels can
+    be rebuilt from src/ directory.
+
+M      data/builder/media-select.builder
+M      data/builder/new-label-dialog.builder
+M      libglabels/db.c
+M      libglabels/db.h
+M      src/Makefile.am
+M      src/media-select.c
+
+commit 270bb68dcf6c6e02af8643bec6e9b82a80542c91
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-03-21
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit cce75a2b36bd94b7771c779c0f0d7b9dd30813b9
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-21
+
+    Added new file to POTFILES.in from last commit.
+
+M      po/POTFILES.in
+
+commit 0a83046c78acea94d80fe2aea239a220445410ab
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-21
+
+    Yet another new "New Label Dialog"
+
+    Re-designed the "New label dialog" again.  This time as a "wizard" or
+    GtkAssistant.  This is an attempt to keep the easy navigation of the
+    2.2.x dialog, to keep the added meta data and preview of the latest
+    incarnation, and to maintain a compact dialog that should work
+    on fairly
+    small displays such on netbooks (probably not hand-helds still).
+
+M      data/builder/Makefile.am
+A      data/builder/media-select.builder
+M      data/builder/new-label-dialog.builder
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/file.c
+D      src/media-combo-menu-item.c
+D      src/media-combo-menu-item.h
+D      src/media-combo-menu.c
+D      src/media-combo-menu.h
+D      src/media-combo.c
+D      src/media-combo.h
+A      src/media-select.c
+A      src/media-select.h
+M      src/new-label-dialog.c
+M      src/new-label-dialog.h
+D      src/rotate-label-button.c
+D      src/rotate-label-button.h
+
+commit fd8e5102e03cf35277af2a99a15d5b5402de5b77
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-03-20
+
+    Updated German translation
+
+M      po/de.po
+
+commit 0f42e39d7e5cacf48e972b50b882fd955288ffaf
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-18
+
+    Escape URLs in markup.
+
+    Escape URLs in vendor and product markup.  Also rearranged the layout
+    of the
+    new "new label" dialog -- I am still not happy with navigating
+    the templates
+    with this new dialog.  I will probably try for a hybrid between
+    this and
+    the 2.2.x dialog.
+
+M      data/builder/new-label-dialog.builder
+M      src/new-label-dialog.c
+
+commit 1d1965d625e85601514f7c6dcf5ef53a34859e5d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-17
+
+    Added missing file from last commit.
+
+A      templates/pearl-iso-templates.xml
+
+commit 3cc850d2ede031b82a21781c029370407b90a980
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-17
+
+    Reconciled label database with 2.2 branch
+
+    Merged recent template additions from 2.2 branch + some cleanup.
+
+M      AUTHORS
+M      templates/Makefile.am
+M      templates/glabels-2.3.dtd
+M      templates/misc-iso-templates.xml
+
+commit 7356e898494b7d68c0fc9063f2ec0fdb867bf471
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-16
+
+    Catching up on template submissions.
+
+M      AUTHORS
+M      templates/misc-iso-templates.xml
+M      templates/misc-us-templates.xml
+
+commit fad9e52268012e6e046cd989d708026d6a244e70
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date:  2010-03-15
+
+    Add Norwegian language entry.
+
+M      po/LINGUAS
+
+commit 5c38897c7d89d517c010e1f8a2271e55bc7f31d3
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date:  2010-03-15
+
+    Added Norwegian bokmål translation
+
+A      po/nb.po
+
+commit 7c7efdf6f7d84030b13761f460eeef61ae0c2fc3
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-13
+
+    Make fractions more readable
+
+    Use Unicode superscripts and subscripts to format fractions.
+    Should be
+    more readable than the uggly 1_5/8.
+
+M      libglabels/str.c
+
+commit 84dfd774bae16f8bdc9dde21baabd41cc7638dd0
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-13
+
+    Some new label dialog cleanup
+
+    Draw arrow in mini preview relative to first label, not the entire
+    sheet.
+    This should be more obvious what the arrow is indicating, before
+    it could
+    have been interpreted as the feed direction.
+
+    Don't put an empty line at the end of the list of similar templates.
+
+M      src/mini-preview.c
+M      src/new-label-dialog.c
+
+commit 4abc5d0a6552b48c0190e5a2baff4a6eb14b9281
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-10
+
+    Reconciled POTFILES.in with last commit.
+
+M      po/POTFILES.in
+
+commit 44ad3d257b9594674604fa82215e72759b40de11
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-10
+
+    Created new "New label dialog"
+
+    Created a new re-designed "New label dialog."  The dialog now shows
+    meta-data
+    for the selected template, including hyperlinks to vendor and product
+    websites, if available.  The new dialog is more compact and thus
+    should
+    be usable on small displays such as netbooks (probably not
+    hand-helds).
+
+    The menu is somewhat clumbsy to navigate still -- will need to
+    reorganize
+    to make navigation easier and more intuitive.
+
+M      data/builder/Makefile.am
+D      data/builder/media-select.builder
+A      data/builder/new-label-dialog.builder
+M      libglabels/db.c
+M      libglabels/db.h
+M      libglabels/str.c
+M      libglabels/str.h
+M      libglabels/template.c
+M      libglabels/template.h
+M      src/Makefile.am
+A      src/media-combo-menu-item.c
+A      src/media-combo-menu-item.h
+A      src/media-combo-menu.c
+A      src/media-combo-menu.h
+A      src/media-combo.c
+A      src/media-combo.h
+D      src/media-select.c
+D      src/media-select.h
+M      src/mini-preview.c
+M      src/mini-preview.h
+M      src/new-label-dialog.c
+M      src/rotate-label-button.c
+M      src/str-util.c
+M      src/str-util.h
+
+commit d94c47da20d726831e16f8cd720d64d26ce85d2b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-03-02
+
+    Minor Cleanup
+
+M      COPYING.README_FIRST
+M      README
+M      configure.ac
+M      libglabels/xml-template.c
+M      libglabels/xml-vendor.c
+M      src/cairo-label-path.c
+M      src/cairo-markup-path.c
+M      src/label-line.c
+M      src/label-text.c
+M      src/template-designer.c
+M      templates/avery-iso-templates.xml
+M      templates/avery-other-templates.xml
+M      templates/avery-us-templates.xml
+M      templates/brother-other-templates.xml
+M      templates/categories.xml
+M      templates/dymo-other-templates.xml
+M      templates/maco-us-templates.xml
+M      templates/misc-iso-templates.xml
+M      templates/misc-other-templates.xml
+M      templates/misc-us-templates.xml
+M      templates/paper-sizes.xml
+M      templates/uline-us-templates.xml
+M      templates/vendors.xml
+M      templates/worldlabel-us-templates.xml
+M      templates/zweckform-iso-templates.xml
+
+commit 4aa7c2ac0a4578c2213b8964dff098f039eef703
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-28
+
+    Cleanup of libglabels documentation.
+
+    Added documentation for new functionality in 3.0, including the vendor
+    database and a new "natural order" compare function for sorting
+    part numbers.
+
+M      docs/libglabels/libglabels-3.0-docs.sgml
+M      docs/libglabels/libglabels-3.0-sections.txt
+M      docs/libglabels/tmpl/db.sgml
+M      docs/libglabels/tmpl/str.sgml
+M      docs/libglabels/tmpl/template.sgml
+A      docs/libglabels/tmpl/vendor.sgml
+A      docs/libglabels/tmpl/xml-vendor.sgml
+M      libglabels/str.c
+M      libglabels/template.c
+M      libglabels/vendor.c
+M      libglabels/xml-template.c
+
+commit 12f3f040b340c30188e4953b9f6a51263206f8ab
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-28
+
+    Updated libglabels documentation to support parallel installation
+
+M      .gitignore
+M      docs/libglabels/Makefile.am
+R094   docs/libglabels/libglabels-docs.sgml
+docs/libglabels/libglabels-3.0-docs.sgml
+R100   docs/libglabels/libglabels-overrides.txt
+docs/libglabels/libglabels-3.0-overrides.txt
+R099   docs/libglabels/libglabels-sections.txt
+docs/libglabels/libglabels-3.0-sections.txt
+R100   docs/libglabels/libglabels.types
+docs/libglabels/libglabels-3.0.types
+R100   docs/libglabels/tmpl/libglabels-unused.sgml
+docs/libglabels/tmpl/libglabels-3.0-unused.sgml
+M      docs/libglabels/tmpl/template.sgml
+M      docs/libglabels/tmpl/units.sgml
+
+commit 7838152cdfea71a3676e40593ab4cb4a30484ffe
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-28
+
+    Additional changes to support parallel installation
+
+    Changed GETTEXT_PACKAGE to glabels-3.0 and renamed help files
+    to support
+    parallel installation with other versions of glabels.
+
+M      .gitignore
+M      configure.ac
+R100   help/C/glabels.xml      help/C/glabels-3.0.xml
+M      help/Makefile.am
+R100   help/glabels.omf.in     help/glabels-3.0.omf.in
+M      po/POTFILES.in
+M      src/ui-commands.c
+
+commit 69f4e1fc6a8a731d8a73e020810aef5a895fba5b
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-26
+
+    Cleanup of mime support
+
+    Removed old mime support files.  Renamed mime icon file.
+
+M      .gitignore
+M      Makefile.am
+M      data/mime/Makefile.am
+R100   data/mime/glabels.xml.in        data/mime/glabels-3.0.xml.in
+D      data/mime/glabels.applications
+D      data/mime/glabels.keys.in
+D      data/mime/glabels.mime
+M      data/pixmaps/Makefile.am
+R100   data/pixmaps/glabels-3.0-application-x-glabels.png
+data/pixmaps/application-x-glabels.png
+
+commit 65b8b97bc7fece41dcbba69f4ef4533c4fc6b2e5
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-25
+
+    Updated mimetype icon.
+
+    Updated mimetype icon to look more modern.
+
+M      data/pixmaps/glabels-3.0-application-x-glabels.png
+
+commit 5f40d24d1843a5b124c9f638bf9d57e7fead5b4f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-24
+
+    Rename executables and key files to support parallel installation
+
+    Renamed glabels and glabels-batch to glabels-3 and glabels-3-batch
+    to support
+    parallel installation with other versions of glabels.  Also renamed
+    and
+    reconciled man pages and icon files.
+
+M      .gitignore
+M      data/desktop/Makefile.am
+R073   data/desktop/glabels.desktop.in
+data/desktop/glabels-3.0.desktop.in
+M      data/man/Makefile.am
+A      data/man/glabels-3-batch.1
+R095   data/man/glabels.1      data/man/glabels-3.1
+M      data/mime/glabels.keys.in
+M      data/pixmaps/Makefile.am
+R100   data/pixmaps/glabels-application-x-glabels.png
+data/pixmaps/glabels-3.0-application-x-glabels.png
+R100   data/pixmaps/glabels.png        data/pixmaps/glabels-3.0.png
+M      src/Makefile.am
+M      src/glabels.c
+M      src/template-designer.c
+
+commit a68f91d57b2eac4a624a0e0c632338b88581d23d
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-24
+
+    Rename glabels data directory to support parallel installation.
+
+    Renamed glabels data directory from glabels to glabels-3.0 to
+    ultimately
+    support parallel installation with older versions of glabels.
+
+M      configure.ac
+M      data/builder/Makefile.am
+M      data/pixmaps/Makefile.am
+M      libglabels/Makefile.am
+M      libglabels/libglabels-3.0.pc.in
+M      src/Makefile.am
+M      src/glabels.c
+M      src/media-select.c
+M      src/merge-properties-dialog.c
+M      src/object-editor.c
+M      src/prefs-dialog.c
+M      src/print-op-dialog.c
+M      src/template-designer.c
+M      src/ui-commands.c
+M      src/ui-property-bar.c
+M      templates/Makefile.am
+
+commit c69edbd06103ad457c2fa87369094f17d7fa9030
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-23
+
+    Make libglabels parallel installable with other versions
+
+    Made libglabels install as libglabels-3.0 to support parallel
+    installation
+    with earlier versions.  Performed some related cleanup associated with
+    this move, including installing libglabels.h into
+    include/libglabels-3.0
+    and installing all other include files in
+    include/libglabels-3.0/libglabels/.
+
+    More work is still need to support parallel installation of the
+    glabels
+    application.
+
+M      .gitignore
+D      INSTALL
+M      autogen.sh
+R079   configure.in    configure.ac
+M      data/desktop/Makefile.am
+M      data/mime/Makefile.am
+M      libglabels/Makefile.am
+R066   libglabels/libglabels.pc.in     libglabels/libglabels-3.0.pc.in
+M      src/Makefile.am
+M      src/combo-util.c
+M      src/file.c
+M      src/font-history-model.c
+M      src/font-util.c
+M      src/glabels-batch.c
+M      src/glabels.c
+M      src/media-select.c
+M      src/merge-evolution.c
+M      src/merge.c
+M      src/mini-label-preview.c
+M      src/mini-preview-pixbuf-cache.c
+M      src/mini-preview.c
+M      src/prefs-model.c
+M      src/prefs.c
+M      src/print-op.c
+M      src/print.c
+M      src/rotate-label-button.c
+M      src/template-designer.c
+M      src/template-history-model.c
+M      src/xml-label-04.c
+M      src/xml-label.c
+M      templates/Makefile.am
+
+commit 50f04182df385b4d535ea22de6b8b44c1545f53d
+Author: Joe Hansen <joedalton2@yahoo.dk>
+Date:  2010-02-23
+
+    Updated Danish translation
+
+A      po/da.po
+
+commit 242db8f321477a9cb3a904928a65aeec0fc292b3
+Author: Kenneth Nielsen <k.nielsen81@gmail.com>
+Date:  2010-02-23
+
+    Added da to list of languages
+
+M      po/LINGUAS
+
+commit 4c65998c8e09c354a93180a39fd35406c28b7dfd
+Author: Jorge González <jorgegonz@svn.gnome.org>
+Date:  2010-02-19
+
+    Added es to DOC_LINGUAS
+
+M      help/Makefile.am
+
+commit 855164906135d8bf586776b628a4e758f9bf8dbe
+Author: Jorge González <jorgegonz@svn.gnome.org>
+Date:  2010-02-19
+
+    Added initial Spanish translation
+
+A      help/es/es.po
+
+commit fc936bcec26a162cbef176125c9ddafa34fa0074
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-02-18
+
+    Fix Czech translation by Marek Cernocky
+
+M      po/cs.po
+
+commit 9959f357a8ab37756c08ef5d63cac2213ab56897
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-02-18
+
+    Add Czech help translation by Marek Cernocky
+
+M      help/Makefile.am
+A      help/cs/cs.po
+A      help/cs/figures/main-window-empty.png
+A      help/cs/figures/merge-ex1-1.png
+A      help/cs/figures/merge-ex1-2.png
+A      help/cs/figures/merge-ex1-3.png
+A      help/cs/figures/merge-ex1-4.png
+A      help/cs/figures/merge-ex2-1.png
+A      help/cs/figures/merge-ex2-2.png
+A      help/cs/figures/merge-ex2-3.png
+A      help/cs/figures/merge-ex2-4.png
+A      help/cs/figures/object-editor-sidebar.png
+A      help/cs/figures/print-copies.png
+A      help/cs/figures/print-merge.png
+
+commit eb35f13b2425449c6ec18b5ac5e3dd43169c3256
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2010-02-12
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit fb41df013f26d24c2cb6d395446a7d142716977b
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-02-11
+
+    Update Czech translation by Marek Cernocky
+
+M      po/cs.po
+
+commit 8f71968174b552bd57d342f2deebf58ef8d2ca81
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-02-03
+
+    Added support for elliptical labels and markup
+
+    Added support for elliptical labels.
+    Added support for elliptical markup lines.
+
+M      docs/libglabels/tmpl/template.sgml
+M      docs/libglabels/tmpl/xml-template.sgml
+M      libglabels/template.c
+M      libglabels/template.h
+M      libglabels/xml-template.c
+M      src/cairo-label-path.c
+M      src/cairo-markup-path.c
+M      templates/glabels-2.3.dtd
+
+commit 1dd19c88400a07af8f9eb33e05d967d19da91b08
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-28
+
+    Tweaks to glView.
+
+    - Draw drop shadow behind label.
+    - Fixed starting grid lines on round labels.
+    - Adjust grid spacing based on selected units:
+      Inches -> 0.125 in
+      mm     -> 5 mm
+      Points -> 10 pt
+
+M      src/units-util.c
+M      src/units-util.h
+M      src/view.c
+M      src/view.h
+
+commit 8fe68d63b2acb46a133e9e643d45657faf54ee50
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-24
+
+    Fixed NULL warning when copying uninitialized barcode objects.
+
+    Make sure both arguments to g_ascii_strcasecmp() are non NULL.
+
+M      src/label-barcode.c
+
+commit 52e8083629f0a9316b7df2bf6b400de8d6bc260e
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-24
+
+    Update TODO list based on current status and plans.
+
+M      TODO
+
+commit efcdc61b8111ba20416592f02da224468cb5c616
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-01-20
+
+    Updated German translation
+
+M      po/de.po
+
+commit a490fde76c660355393bebff2fe48ec4daa3bfd7
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-18
+
+    Don't allow message bars to stack up in media select widget.
+
+    Remove old glMessageBar when attempting to load glMediaSelect
+    tree views.
+    This will make sure if a new glMessageBar is needed, it won't
+    just stack
+    up old message bars.
+
+M      src/media-select.c
+
+commit c840dc081304d5f1b6bba2009324c83dea0d0d7f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-18
+
+    Cleanup and addition of label templates.
+
+    Reconciled Worldlabel part numbers with current online information.
+    Added
+    some additional templates and their Avery look-alikes.
+
+M      templates/avery-us-templates.xml
+M      templates/worldlabel-us-templates.xml
+
+commit 938da1f73ef790eb1691d0037ba0686cfececee5
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-01-15
+
+    Added fr to DOC_LINGUAS
+
+M      help/Makefile.am
+
+commit 0a1c588f5bb1766a5daef21d0427b37c11489ea6
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-01-14
+
+    Removed trailing whitespaces from POTFILES.in
+
+M      po/POTFILES.in
+
+commit d49f1149ff6d35d100444b198d532f84c26ccfc3
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2010-01-14
+
+    Added missing template files to POTFILES.in
+
+M      po/POTFILES.in
+
+commit 73581f4f9b30bd423f930c3fa1bc3942bb5694fd
+Author: Petr Kovar <pknbe@volny.cz>
+Date:  2010-01-13
+
+    Updated Czech translation by Marek Cernocky
+
+M      po/cs.po
+
+commit 9b783558c733321de3e7be150cf3cbf21ddfa985
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2010-01-09
+
+    Add French translation of manual
+
+    Contributed by Alain Lojewski and Claude Paroz
+
+A      help/fr/figures/main-window-empty.png
+A      help/fr/figures/merge-ex1-1.png
+A      help/fr/figures/merge-ex1-2.png
+A      help/fr/figures/merge-ex1-3.png
+A      help/fr/figures/merge-ex1-4.png
+A      help/fr/figures/merge-ex2-1.png
+A      help/fr/figures/merge-ex2-2.png
+A      help/fr/figures/merge-ex2-3.png
+A      help/fr/figures/merge-ex2-4.png
+A      help/fr/figures/object-editor-sidebar.png
+A      help/fr/figures/print-copies.png
+A      help/fr/figures/print-merge.png
+A      help/fr/fr.po
+
+commit 091eea6d387183ae34da9a59dbe6ce784e15e544
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-06
+
+    Delay freeing of pixbuf cache in gl_label_finalize()
+
+    Make sure all objects have been unreferenced before freeing pixbuf
+    cache --
+    including copies in undo/redo stacks.
+
+M      src/label.c
+
+commit 9f99c2dc866740bf252fa6f0e6e28d165ae3606f
+Author: Jim Evins <evins@snaught.com>
+Date:  2010-01-03
+
+    Use "natural" sorting order for part numbers
+
+    Use a "natural" sorting order for part numbers.  I.e. numeric
+    portions are
+    sorted numerically rather than character by character, such that
+    "A20" will precede "A100".
+
+    Also found and fixed a couple minor inconsistencies in the template
+    data base
+    while debugging the new sorting code.
+
+M      libglabels/db.c
+M      libglabels/str.c
+M      libglabels/str.h
+M      templates/avery-other-templates.xml
+M      templates/avery-us-templates.xml
+
+commit 90cd31f442b5d0d115ea72fe828414ad32c9e944
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-30
+
+    Reorganizing template database
+
+    Split out uline-us-templates.xml from avery-us-templates.xml.
+    Also removed
+    the single "IP Invent It!" alias.  I could not find this brand online
+    -- I
+    assume it was a mis-identification -- this was a single alias for
+    full-sheet
+    labels which is so generic anyway.
+
+M      templates/Makefile.am
+M      templates/avery-us-templates.xml
+C053   templates/vendors.xml   templates/uline-us-templates.xml
+M      templates/vendors.xml
+
+commit a5de57d22d62436c5d1014d376ecd22dff8c7853
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-30
+
+    Reorganizing label database
+
+    Reorganized avery-us-templates.xml to remove deprecated Alias tags.
+    Also,
+    split out separate worldlabel-us-templates.xml and
+    maco-us-templates.xml
+    files.
+
+M      templates/Makefile.am
+M      templates/avery-us-templates.xml
+A      templates/maco-us-templates.xml
+A      templates/worldlabel-us-templates.xml
+
+commit f09e62c27585cbf067d6bae33ecd4496d17b1ebc
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-12-28
+
+    Updated German translation
+
+M      po/de.po
+
+commit b0fcb9d96c1719d1841294dc76f81893c600ace9
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-26
+
+    Handle zoom-to-fit properly for unrealized view
+
+    Delay calculations in gl_view_zoom_to_fit() if window has not been
+    realized
+    yet.  Do calculations in realize callback.
+
+M      src/view.c
+
+commit 03609218a247efb40b71dc10827feff80c05dce2
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-23
+
+    Fixed typo
+
+    Fixed typo.
+
+M      src/label.c
+
+commit 73b70cb6f49f732eb826f145cd1c229f707abc7f
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-22
+
+    Added undo/redo feature
+
+    Checkpoint the label state before each user initiated change.  These
+    checkpoint states are kept on an undo stack.  As the user pops items
+    from the undo stack, the current state is pushed onto a redo stack.
+
+M      src/file.c
+M      src/glabels-batch.c
+M      src/label-barcode.c
+M      src/label-barcode.h
+M      src/label-box.c
+M      src/label-box.h
+M      src/label-ellipse.c
+M      src/label-ellipse.h
+M      src/label-image.c
+M      src/label-image.h
+M      src/label-line.c
+M      src/label-line.h
+M      src/label-object.c
+M      src/label-object.h
+M      src/label-text.c
+M      src/label-text.h
+M      src/label.c
+M      src/label.h
+M      src/merge-properties-dialog.c
+M      src/object-editor.c
+M      src/template-designer.c
+M      src/ui-commands.c
+M      src/ui-commands.h
+M      src/ui-property-bar.c
+M      src/ui.c
+M      src/view-barcode.c
+M      src/view-box.c
+M      src/view-ellipse.c
+M      src/view-image.c
+M      src/view-line.c
+M      src/view-text.c
+M      src/view.c
+M      src/window.c
+M      src/xml-label-04.c
+M      src/xml-label.c
+
+commit ab665830afa2c549d3b3d76a5a3f20affcc69f57
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-17
+
+    Refactored MediaSelect code
+
+    - Renamed glWdgtMediaSelect to glMediaSelect
+    - Created new glMessageBar widget derived from GtkInfoBar -- API
+    is modelled
+      after GtkMessageDialog.  Used this new widget to provide
+      notification
+      of empty search results in the 2 glMediaSelect tabs.
+    - Simple code formatting changes.
+
+M      data/builder/Makefile.am
+R084   data/builder/wdgt-media-select.builder
+data/builder/media-select.builder
+M      po/POTFILES.in
+M      src/Makefile.am
+R069   src/wdgt-media-select.c src/media-select.c
+A      src/media-select.h
+A      src/message-bar.c
+A      src/message-bar.h
+M      src/new-label-dialog.c
+D      src/wdgt-media-select.h
+
+commit d677458f28c10fe6e0a5663a67aa8edd87424e36
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-16
+
+    Minor cleanup.
+
+    Removed extra includes.
+
+M      src/view-barcode.h
+M      src/view-box.h
+M      src/view-ellipse.h
+M      src/view-image.h
+M      src/view-line.h
+M      src/view-text.h
+
+commit 3bd29145040c79580b03e4e0e430afd6164ef806
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2009-12-17
+
+    Added sl for Slovenian translation
+
+M      po/LINGUAS
+
+commit ee83ad3f392f9bbf630cbf32fdeac436a78f391b
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date:  2009-12-17
+
+    Updated Slovenian translation
+
+A      po/sl.po
+
+commit cbfbbff95d01ff6daffbb24159aa6fa0a4ae2e1c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-15
+
+    Use glFieldButton instead of GtkComboBox for field selection
+
+    Extended glFieldButton so that it could be used instead of a
+    GtkComboBox
+    for field selectors in the object editor.  This unifies the dropdown
+    style
+    with the "Insert field" button on the text editor page.
+
+M      data/builder/object-editor.builder
+M      src/field-button.c
+M      src/field-button.h
+M      src/object-editor-bc-page.c
+M      src/object-editor-data-page.c
+M      src/object-editor-fill-page.c
+M      src/object-editor-image-page.c
+M      src/object-editor-line-page.c
+M      src/object-editor-private.h
+M      src/object-editor-shadow-page.c
+M      src/object-editor-text-page.c
+M      src/object-editor.c
+
+commit 1bddb489410c3e82ced613cd500080c5e0e94790
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-15
+
+    Minor cleanup of label.c
+
+    Removed unused variables.  Added a couple explicit casts.
+
+M      src/label.c
+
+commit 0f2ea2061dd8f4e957c9b5241842de578cb78d0b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-13
+
+    Fixed crash when manipulating barcode
+
+    Failed to initialize line_color_node for barcodes in
+    object_changed_cb().
+
+M      src/object-editor.c
+
+commit be84e5a72c2ffc412fcf7905115a78b8faa6820b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-12
+
+    Always show images for object menuitems
+
+    Because of the visual nature of the actions of these menuitems,
+    the visual
+    cues provided by these icons should help improve the ability to
+    find the
+    correct menuitem -- I know it does for me ( I don't always know
+    my left
+    from my right :-))
+
+M      src/ui.c
+
+commit 4e81eb872bef66a6b76e9ffd74c09a83323f802e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-12
+
+    Refactored Cut/Copy/Paste code
+
+    Now offers everything (glabels xml, text, or image) on the standard
+    clipboard.
+    Will now paste text or images from other programs as new objects.
+
+M      src/label-image.c
+M      src/label-image.h
+M      src/label-object.c
+M      src/label-object.h
+M      src/label-text.c
+M      src/label-text.h
+M      src/label.c
+M      src/label.h
+M      src/ui-commands.c
+M      src/ui.h
+M      src/window.c
+
+commit 3444d934754fcc305af29a8c05f19792c77b89e2
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:  2009-12-08
+
+    Allow merge source to be stdin
+
+    Use the filename "-" to indicate that the merge source is to be
+    taken from
+    standard input (stdin).  This is primarily intended for the
+    glabels-batch
+    program.
+
+M      src/merge-text.c
+
+commit 85bfb8a64853db59f56410670675015a8aa716e5
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:  2009-12-08
+
+    Fix glabels-batch crash
+
+    The template_history subsystem needs to be initialized.
+
+M      AUTHORS
+M      src/glabels-batch.c
+
+commit 02157b5db05cdf1cca285454c83bccb909ee99b8
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-07
+
+    Install correct DTD file
+
+    Reconciled templates/Makefile.am with recent name change of DTD file.
+
+M      templates/Makefile.am
+
+commit 2d0ad672af26c3bc863e0a56a65a6be89944ced8
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-06
+
+    Libglabels mods to support reorganization of template database
+
+    Added "equiv" attribute to "Template" tag. The "equiv" attribute
+    works
+    differently than the "Alias" tag: instead of defining a simple
+    alias for
+    the current template struct, it says to use the equivalent part as the
+    prototype for this template.  The template could override (or append)
+    unique meta data for this part number.  The "Alias" tag is still
+    supported,
+    but is deprecated.
+
+    Added a "product_url" attribute to the "Meta" tag.
+
+    Added a "vendor.xml" file which contains a database of vendors
+    and their
+    primary url.  This file has only been populated with a few examples
+    so far.
+
+    A new DTD file has been created to describe the above changes.
+
+    The "Avery 5160" family in "avery-us-templates.xml", has been
+    organized in
+    the new scheme as an example.
+
+M      libglabels/Makefile.am
+M      libglabels/db.c
+M      libglabels/db.h
+M      libglabels/libglabels-private.h
+M      libglabels/template.c
+M      libglabels/template.h
+A      libglabels/vendor.c
+C059   libglabels/libglabels-private.h libglabels/vendor.h
+M      libglabels/xml-template.c
+M      libglabels/xml-template.h
+A      libglabels/xml-vendor.c
+C061   libglabels/libglabels-private.h libglabels/xml-vendor.h
+M      templates/Makefile.am
+M      templates/avery-us-templates.xml
+R091   templates/glabels-2.2.dtd       templates/glabels-2.3.dtd
+A      templates/vendors.xml
+
+commit 5f45a608055226f06cd013a414439293174121f4
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-03
+
+    Improved object editor default page selection
+
+    Whenever the object is changed, an attempt is made to either keep
+    the same
+    page active or if that page is no longer visible, set to the first
+    visible
+    page.
+
+M      src/object-editor.c
+
+commit 520ea9f42482012404000e7eebe436c94bca4440
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-03
+
+    Follow focus when setting sensitivity of selection verbs
+
+    The previous commit did not completely work right. Selection verb
+    sensitivity now follows the focus of the glView widget.
+
+M      src/ui.c
+M      src/ui.h
+M      src/window.c
+
+commit 8ae9003ee19f2c508452ca5a8534af6caf7a6b11
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-12-03
+
+    Updated German translation
+
+M      po/de.po
+
+commit 2d0b321b49e0dcf8701d000bc2c5f9f4673689f8
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-02
+
+    Don't intercept copy/paste operations intended for other widgets
+
+    Fixes bugs 1683799, 2833194 and probably 1978142.  Only enable
+    copy/paste
+    verbs if the focused widget is the glView. Otherwise let these
+    operations
+    propagate to the focused widget to be handled natively.
+
+M      .gitignore
+M      src/label.c
+M      src/label.h
+M      src/ui-commands.c
+M      src/ui.c
+M      src/ui.h
+M      src/window.c
+
+commit 9ad72e4b3df7122496e84af4bbc1013738145f5b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-02
+
+    Control sensitivity of paste verb
+
+    Track the availability of data on the private glabels clipboard
+    to control
+    the sensitivity of the paste verb.
+
+M      src/ui.c
+M      src/ui.h
+M      src/window.c
+
+commit c7934cf38d69f29e539a4110de36e88c8ed070bb
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-02
+
+    Some string cleanup
+
+    - Replaced "x" with UTF D7 "TIMES" symbol in dimension strings
+    - Separated "diameter" into its own translatable string
+
+M      src/wdgt-media-select.c
+
+commit ff3a495ea186e7ff5d68a589312b3e2ef5c7d35e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-12-02
+
+    Refactored glLabel and glView
+
+    Refactored glLabel and glView code:
+
+    - Moved selection tracking and storage of current label defaults from
+      glView to glLabel.
+
+    - Removed complexity of synchronizing lists of labels between
+    glView and
+      glLabel.
+
+    - Current defaults for new objects are now kept in glLabel,
+    not glView.
+
+    - Now follows a more faithful MVC pattern. As a consequence, the
+      Object editor and property bar are now fully independent views of
+      glLabel and do not need to be aware of glView at all.
+
+    - Refactoring reduced total SLOC count by about 1100 lines of code.
+
+    - This should potentially simplify the addition of an Undo/Redo
+      capability, because selections and object lists do not need
+      to be kept synchronized.
+
+M      .gitignore
+M      data/builder/object-editor.builder
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/cairo-label-path.c
+M      src/cairo-label-path.h
+M      src/cairo-markup-path.c
+M      src/color-swatch.c
+M      src/file.c
+M      src/glabels-batch.c
+M      src/label-barcode.c
+M      src/label-box.c
+M      src/label-ellipse.c
+M      src/label-image.c
+M      src/label-line.c
+M      src/label-object.c
+M      src/label-object.h
+M      src/label-text.c
+M      src/label-text.h
+M      src/label.c
+M      src/label.h
+M      src/object-editor-bc-page.c
+M      src/object-editor-data-page.c
+M      src/object-editor-fill-page.c
+M      src/object-editor-image-page.c
+M      src/object-editor-line-page.c
+M      src/object-editor-lsize-page.c
+M      src/object-editor-private.h
+M      src/object-editor-shadow-page.c
+M      src/object-editor-size-page.c
+M      src/object-editor-text-page.c
+M      src/object-editor.c
+M      src/object-editor.h
+M      src/print-op-dialog.c
+M      src/print-op.c
+M      src/print.c
+M      src/ui-commands.c
+M      src/ui-property-bar.c
+M      src/ui-property-bar.h
+M      src/ui-sidebar.c
+M      src/ui-sidebar.h
+M      src/ui.c
+M      src/view-barcode.c
+M      src/view-barcode.h
+M      src/view-box.c
+M      src/view-box.h
+M      src/view-ellipse.c
+M      src/view-ellipse.h
+M      src/view-image.c
+M      src/view-image.h
+M      src/view-line.c
+M      src/view-line.h
+D      src/view-object.c
+D      src/view-object.h
+M      src/view-text.c
+M      src/view-text.h
+M      src/view.c
+M      src/view.h
+M      src/window.c
+M      src/window.h
+M      src/xml-label.c
+
+commit 280d7ace9c2dd028515ecad81b4003109ef1b5d3
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-12-02
+
+    Updated German translation
+
+M      po/de.po
+
+commit 82bdbd24494f2351389c3e2eceef20e21ac93f46
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-22
+
+    Added additional file to .gitignore.
+
+M      .gitignore
+
+commit b87405cab3c8fba70b5261280b5ed1e3de0871bd
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-22
+
+    Use accessor functions instead direct access
+
+    Replaced direct access of widget fields with accessor functions.
+    This round
+    catches flags and allocations which now have accessor functions in
+    Gtk 2.18.
+    As a result, the master branch now requires Gtk-2.18/GNOME-2.28.
+
+M      configure.in
+D      docs/libglabels/libglabels-decl-list.txt
+M      src/color-combo-button.c
+M      src/color-combo.c
+M      src/color-swatch.c
+M      src/field-button.c
+M      src/font-combo.c
+M      src/font-sample.c
+M      src/glabels-batch.c
+M      src/merge-text.c
+M      src/mini-label-preview.c
+M      src/mini-preview.c
+M      src/object-editor-edit-page.c
+M      src/view.c
+M      src/wdgt-chain-button.c
+
+commit 841296e9d9882d93af94b8dc08765a42c9a3bb9e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-18
+
+    Updated AUTHORS and .gitignore
+
+    Added Mario to AUTHORS so that he gets proper credit.
+
+    Added another pattern to .gitignore.
+
+M      .gitignore
+M      AUTHORS
+
+commit d6fb9999d0996c1c3528de406e486efce5bb5511
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-18
+
+    Fixed focus behavior of view canvas
+
+    Fixes bug #2899305.  Don't just automatically steal focus when
+    entering
+    canvas.  Require a click to get focus back.
+
+M      src/view.c
+
+commit 971a85643f25304fe1eda917f4771cd498a0d89c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-17
+
+    Reference glabels.org website
+
+    Change all references to the glabels.sourceforge.net website to the
+    glabels.org alias. Change namespace for 2.3 development version to
+    glabels.org/xmlns/2.3/.
+
+M      MESSAGE-OF-DOOM
+M      README
+M      data/man/glabels.1
+M      glabels.doap
+M      libglabels/xml.h
+M      src/ui-commands.c
+M      src/xml-label.c
+
+commit 0f07e3243d10acd2343adbc711bee89baf568023
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-08
+
+    Expose all supported fields in vcard backend
+
+    The original version of the vcard merge backend only supported
+    3 hard-coded
+    fields.  This modification exposes all supported fields, via the
+    libebook
+    API.  It also uses the "pretty names" for field names, exactly as the
+    evolution merge backend does.
+
+    An "off-by-one" error in the evolution merge backend has also been
+    fixed --
+    exposing one more field.
+
+M      src/merge-evolution.c
+M      src/merge-vcard.c
+
+commit 474a40371a2adeadb61ae710c52f5591b7363093
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-07
+
+    Removed unused defines
+
+    Removed unused defines from INCLUDES.
+
+M      libglabels/Makefile.am
+M      src/Makefile.am
+
+commit 06b2f56f9594ec0bde746aab774ccb4aa33b9dbf
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-07
+
+    Added support for Code93 barcode.
+
+    Added glue to support for Code93 barcode, which is already supported
+    by
+    the GNU Barcode Library.
+
+M      src/bc-gnubarcode.c
+M      src/bc.c
+
+commit fc18f8be1747cb29d33ee7bdf05b354318778017
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-05
+
+    Automatically generate ChangeLog when building dist
+
+    Automatically generate ChangeLog when building distributions using
+    'git log'.
+
+M      .gitignore
+M      ChangeLog
+M      Makefile.am
+
+commit a2b827198e23b23ed064b822c9331813758c2856
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-05
+
+    Caught up on user submitted templates.
+
+    Added user submitted templates and acknowledgements.
+
+M      AUTHORS
+M      templates/misc-iso-templates.xml
+M      templates/zweckform-iso-templates.xml
+
+commit 8016d6f4fe8f4970ce615d53d2d541be6afef850
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-04
+
+    Fixed merge inconsistencies and crash
+
+    merge.c:
+       Fixed crash when trying to print when a "key" radio has been
+       selected
+       but no key has been selected yet.
+
+    object-editor-*-page.c:
+       Fixed potential inconsistencies with "key" radio buttons when
+       a merge
+       source has not been selected but the field indicates that it is
+       using a
+       merge key.  This can happen when opening a glabels file that
+       has a merge
+       type not supported by the current instance of glabels.
+
+    xml-label.c:
+       Also when parsing a merge field that has a merge type not
+       supported,
+       don't continue parsing it.
+
+M      src/merge.c
+M      src/object-editor-bc-page.c
+M      src/object-editor-data-page.c
+M      src/object-editor-fill-page.c
+M      src/object-editor-image-page.c
+M      src/object-editor-line-page.c
+M      src/object-editor-shadow-page.c
+M      src/object-editor-text-page.c
+M      src/xml-label.c
+
+commit dcf2b94b88479c283abdf7b65affd77ea5919ce9
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-03
+
+    Don't allow clipping to affect outlines
+
+    Remove clipping region before printing outlines of labels.
+
+M      src/print.c
+
+commit 6cd2cf8a1b548608959dac94229c634e1f3a0f7e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-03
+
+    Clip to outline restored
+
+    During my last commit & push, I left the clip to outline line
+    commented out
+    which is an artifact of my testing.
+
+M      src/print.c
+
+commit e0db4b1264c2d87b82092987dc4a5d0d803f352c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-11-03
+
+    Added simple envelope support
+
+    Added several envelope sizes to page-sizes.xml.  Also reversed
+    the rotation
+    direction when printing rotated labels to better match the
+    orientation of
+    envelope feeders.
+
+M      src/print.c
+M      templates/paper-sizes.xml
+
+commit 97c5b449004606b377f8a75ec65c56019e118882
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-11-03
+
+    Updated German translation
+
+M      po/de.po
+
+commit 397ea71c27af9920b71c3fbf197ffe8a10d6583b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-30
+
+    Copy all fields when duplicating glMergeText object.
+
+    Copy n_fields_max field when duplicating glMergeText object.
+
+M      src/merge-text.c
+
+commit 8fd8b99f7edf0decfc3ea58fa5931c853c96fd0e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-29
+
+    Harvest line 1 of CSVs for field names
+
+    Added capability to text merge backend to harvest line 1 for field
+    names (keys).
+
+M      src/merge-init.c
+M      src/merge-text.c
+M      src/merge-text.h
+
+commit 19428af40ad4f1c6c5fc947046429bf22ca4a13b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-26
+
+    Make libglabels include guards more unique
+
+    Renamed libglabels include guards to be more unique.  For example,
+    the include
+    guard for xml.h was renamed from __XML_H__ to __LGL_XML_H__, which
+    is less
+    likely to collide with other similarly named macros.
+
+M      libglabels/category.h
+M      libglabels/db.h
+M      libglabels/paper.h
+M      libglabels/str.h
+M      libglabels/template.h
+M      libglabels/xml-category.h
+M      libglabels/xml-paper.h
+M      libglabels/xml-template.h
+M      libglabels/xml.h
+
+commit ab8bb6ad208670b587d23f55c9edb5ba8c754050
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-26
+
+    Improved menu positioning functions
+
+    Use requisition instead of allocation for menu size (the allocation
+    does not
+    exist for a newly realized menu, so the position is not always
+    right the
+    first time it is popped up, causing a mangled menu position with ugly
+    scroll buttons.)
+
+    Query for the actual screen of "this" instead of blindly using
+    the default
+    screen.
+
+M      src/color-combo-button.c
+M      src/color-combo.c
+M      src/field-button.c
+M      src/font-combo.c
+
+commit 4d71d3f3e3cc8300be41c58867f9386d53e4b760
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-25
+
+    Refactored glPrefsModel; Added Units module to libglabels
+
+    Refactored glPrefsModel, reconciling its style with glFontsHistory,
+    etc.
+
+    Added Units module to libglabels, consolidating most utilities
+    associated
+    with units into this module.  Also created a units-util module in
+    glabels for utilities that do not belong in libglabels.
+
+M      docs/libglabels/libglabels-decl-list.txt
+M      docs/libglabels/libglabels-docs.sgml
+M      docs/libglabels/libglabels-sections.txt
+D      docs/libglabels/libglabels-undocumented.txt
+D      docs/libglabels/tmpl/enums.sgml
+M      docs/libglabels/tmpl/libglabels-unused.sgml
+M      docs/libglabels/tmpl/paper.sgml
+A      docs/libglabels/tmpl/units.sgml
+M      libglabels/Makefile.am
+M      libglabels/libglabels.h
+A      libglabels/units.c
+R070   libglabels/enums.h      libglabels/units.h
+M      libglabels/xml.c
+M      libglabels/xml.h
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/cairo-label-path.c
+M      src/font-combo-menu.c
+M      src/font-history-model.c
+M      src/glabels.c
+M      src/object-editor-bc-page.c
+M      src/object-editor-fill-page.c
+M      src/object-editor-line-page.c
+M      src/object-editor-lsize-page.c
+M      src/object-editor-position-page.c
+M      src/object-editor-shadow-page.c
+M      src/object-editor-size-page.c
+M      src/object-editor-text-page.c
+M      src/prefs-dialog.c
+M      src/prefs-model.c
+M      src/prefs-model.h
+M      src/prefs.c
+M      src/prefs.h
+M      src/recent.c
+M      src/template-designer.c
+M      src/ui-commands.c
+M      src/ui-property-bar.c
+M      src/ui.c
+C052   src/prefs.c     src/units-util.c
+C066   src/prefs.h     src/units-util.h
+M      src/view.c
+M      src/wdgt-media-select.c
+M      src/window.c
+M      src/xml-label.c
+
+commit 3b8bb98a84de015cdc937f7e2b767e4c1f11f4ee
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-24
+
+    Removed unused variables
+
+    Removed unused variables from draw_text_real().
+
+M      src/label-text.c
+
+commit ebe7c16c62c4d724b2a09b51c8a7c72c42cb0960
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-24
+
+    Created new glTemplateHistoryModel
+
+    Pulled recent template history from glPrefsModel and created
+    a separate
+    glTemplateHistoryModel object to track this history.  Based on
+    glFontHistoryModel.
+
+M      .gitignore
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/glabels-batch.c
+M      src/glabels.c
+M      src/label.c
+M      src/prefs-model.c
+M      src/prefs-model.h
+M      src/prefs.c
+M      src/prefs.h
+A      src/template-history-model.c
+A      src/template-history-model.h
+A      src/template-history.c
+C060   src/prefs.h     src/template-history.h
+M      src/wdgt-media-select.c
+
+commit 87e9f1324b388483e0078ebcccda4ffa30687bd2
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-24
+
+    Use GConf to store custom color history
+
+    Renamed glColorComboHistory to glColorHistoryModel and reconciled
+    style
+    with glFontHistoryModel.  glColorHistoryModel now front-ends GConf
+    to store
+    custom color history between sessions.
+
+M      po/POTFILES.in
+M      src/Makefile.am
+D      src/color-combo-history.c
+D      src/color-combo-history.h
+M      src/color-combo-menu.c
+C062   src/font-history-model.c        src/color-history-model.c
+A      src/color-history-model.h
+M      src/font-history-model.c
+M      src/font-history-model.h
+
+commit b69e6e688733168b847f4c0785f75e21b5f77dfd
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-24
+
+    Use GConf to store font history
+
+    glFontHistoryModel now front-ends GConf to store font history between
+    sessions.  Also, don't store default font family when creating a blank
+    label text object.
+
+M      src/font-combo-menu.c
+M      src/font-history-model.c
+M      src/font-history-model.h
+M      src/font-util.c
+M      src/font-util.h
+M      src/label-text.c
+
+commit b0a92a3f0b9855585fb7fe856483d2e8cece64f7
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-22
+
+    Added font history
+
+    Added font history object. Setting/changing fonts in text objects
+    updates
+    this object.  The glFontCombMenu tracks this object to keep its recent
+    fonts submenu up-to-date.
+
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/font-combo-menu.c
+A      src/font-history-model.c
+A      src/font-history-model.h
+A      src/font-history.c
+A      src/font-history.h
+M      src/glabels-batch.c
+M      src/glabels.c
+M      src/label-text.c
+
+commit 1a23b8164c972458c3a434e892c6810939ac424b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-21
+
+    Make glFieldButtonMenu multi-columned for large number of keys.
+
+    Make glFieldButtonMenu multi-columned for large number of keys.
+    I don't know
+    why, but I need to unrealize the old menu whenever reloading a new
+    set of
+    keys -- otherwise, the new menu would not render properly.
+
+    Also, cleared the CAN_FOCUS and CAN_DEFAULT bits for the instance in
+    the object editor text edit page, so that it would not steal the focus
+    from the text editor.
+
+M      src/field-button-menu.c
+M      src/object-editor-edit-page.c
+
+commit f83b6537a0fdf8f6f25483ab691a76923c10508a
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-20
+
+    Minor cleanup of glFieldButton widgets
+
+    Free proper data in gl_field_button_menu_finalize().  Minor formatting
+    cleanup.
+
+M      src/field-button-menu.c
+M      src/field-button-menu.h
+M      src/field-button.c
+
+commit 797627cec95e55d0305a0b7aa81811cd5be291a4
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-19
+
+    Create new glFieldButton widget family
+
+    Created new glFieldButton widget family modelled after glFontCombo.
+    This
+    widget is for inserting merge fields into text.  This button will
+    pop-up
+    a menu containing possible field keys.  The button attempts to
+    place the
+    menu intelligently, rather than simply where the button was pressed.
+
+    Renamed glWdgtMergeMenu to glFieldButtonMenu.
+
+M      data/builder/object-editor.builder
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/debug.c
+M      src/debug.h
+R060   src/wdgt-merge-menu.c   src/field-button-menu.c
+A      src/field-button-menu.h
+A      src/field-button.c
+A      src/field-button.h
+M      src/object-editor-edit-page.c
+M      src/object-editor-private.h
+M      src/object-editor.c
+D      src/wdgt-merge-menu.h
+
+commit aac305dceb30dcc44e50917da3350fca428ef5d4
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-18
+
+    Cleanup of configure.in
+
+    More minor cleanup of configure.in.  My iec16022 patch was accepted
+    upstream
+    and there was a new release -- update required version.  Added URLs to
+    configure.in to inform packagers where to obtain upstream libraries.
+    Updated
+    README to document these optional dependencies.
+
+M      README
+M      configure.in
+M      src/Makefile.am
+
+commit 0060d0193ece855c41a9d079e074fd659d406256
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-17
+
+    Refine glFontComboMenuItem tooltip sample text.
+
+    Refine sample text used in tooltip for glFontComboMenuItem.
+    The sample
+    alphabet, numbers and special symbols text is now localized.
+    Also used
+    Pango to get a localized sample string such as "The quick brown
+    fox..."
+
+M      src/font-combo-menu-item.c
+
+commit 360d5b047a6eb4855bd4018f05bd083b465ed084
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-11
+
+    Cleanup of configure.in
+
+    Minor cleanup of configure.in.  Assumes libiec16022 will be installed
+    along
+    with a pkg-config file -- patch to upstream has been submitted --
+    we shall
+    see.
+
+M      configure.in
+
+commit 95316ca98ce80e0569ec66b66e8d4efa2a11a737
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-11
+
+    Added .gitignore
+
+    Added .gitignore file to cleanup cruft reported by "git status"
+
+A      .gitignore
+
+commit 480d31eff113c6a5136f56654bdbed67805c269c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-11
+
+    Use accessor functions instead direct access
+
+    Replaced several occurances of directly accessing widget fields
+    with the
+    use of accessor functions. This round hit primarily windows,
+    bin_windows
+    and styles. Still need to address flags and allocations when GTK
+    has the
+    needed accessors.
+
+M      src/color-combo-button.c
+M      src/color-combo.c
+M      src/color-swatch.c
+M      src/font-combo.c
+M      src/font-sample.c
+M      src/mini-label-preview.c
+M      src/mini-preview.c
+M      src/view.c
+M      src/wdgt-chain-button.c
+
+commit f9d1fc9b35f9c3b9005340f954298aaf5f6623a0
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-10
+
+    Converted pl.po to UTF-8 again
+
+M      po/pl.po
+
+commit 98c57ae33f847d1e97be507fdb4efcc09d680d2e
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-10
+
+    Converted pt_BR.po to UTF-8
+
+M      po/pt_BR.po
+
+commit dc43c1b38e3fa9f5dd0e6627e07a059ccd808fb2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-10
+
+    Updated NEWS
+
+M      NEWS
+
+commit cf622f9277e6db8bc641b7c39a53163712bdd064
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-08
+
+    Use accessor functions instead direct access
+
+    Replaced several occurances of directly accessing widget fields
+    with the
+    use of accessor functions. This round only hit some of the
+    low-hanging
+    fruit -- several modules still contain many such accesses.
+
+M      src/color-combo-menu.c
+M      src/combo-util.c
+M      src/merge-properties-dialog.c
+M      src/new-label-dialog.c
+M      src/prefs-dialog.c
+
+commit 67a64dea73deedfc465df50fd92442a460fa5f42
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-07
+
+    Removed 3rd-party libraries
+
+    The 3rd-party libraries used as barcode backends are no longer
+    redistributed
+    with gLabels.  These libraries are now optional external dependencies,
+    so if
+    one is not present it will not be used.
+
+    FIXME: the datamatrix IEC 16022 library is not installed by default
+    by the
+    official iec16022 tarball.
+
+M      AUTHORS
+M      COPYING.README_FIRST
+M      Makefile.am
+D      bc-backends/Makefile.am
+D      bc-backends/barcode-0.98/COPYING
+D      bc-backends/barcode-0.98/ChangeLog
+D      bc-backends/barcode-0.98/INSTALL
+D      bc-backends/barcode-0.98/Makefile.am
+D      bc-backends/barcode-0.98/Makefile.in.dist
+D      bc-backends/barcode-0.98/README
+D      bc-backends/barcode-0.98/README.glabels
+D      bc-backends/barcode-0.98/TODO
+D      bc-backends/barcode-0.98/barcode.h
+D      bc-backends/barcode-0.98/barcode.spec
+D      bc-backends/barcode-0.98/bookland/bookland.py
+D      bc-backends/barcode-0.98/cmdline.c
+D      bc-backends/barcode-0.98/cmdline.h
+D      bc-backends/barcode-0.98/codabar.c
+D      bc-backends/barcode-0.98/code128.c
+D      bc-backends/barcode-0.98/code39.c
+D      bc-backends/barcode-0.98/code93.c
+D      bc-backends/barcode-0.98/compat/getopt.c
+D      bc-backends/barcode-0.98/compat/getopt.h
+D      bc-backends/barcode-0.98/configure
+D      bc-backends/barcode-0.98/configure.in.dist
+D      bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz
+D      bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+D      bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+D      bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+D      bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz
+D      bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+D      bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz
+D      bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+D      bc-backends/barcode-0.98/debian/README.debian
+D      bc-backends/barcode-0.98/debian/changelog
+D      bc-backends/barcode-0.98/debian/control
+D      bc-backends/barcode-0.98/debian/copyright
+D      bc-backends/barcode-0.98/debian/dirs
+D      bc-backends/barcode-0.98/debian/info
+D      bc-backends/barcode-0.98/debian/rules
+D      bc-backends/barcode-0.98/doc/Makefile.in
+D      bc-backends/barcode-0.98/doc/README
+D      bc-backends/barcode-0.98/doc/barcode.info
+D      bc-backends/barcode-0.98/doc/barcode.pdf
+D      bc-backends/barcode-0.98/doc/barcode.ps
+D      bc-backends/barcode-0.98/doc/barcodedoc.txt
+D      bc-backends/barcode-0.98/doc/doc.barcode
+D      bc-backends/barcode-0.98/doc/infofilter
+D      bc-backends/barcode-0.98/doc/manpager
+D      bc-backends/barcode-0.98/doc/mktxt
+D      bc-backends/barcode-0.98/doc/texi2html
+D      bc-backends/barcode-0.98/ean.c
+D      bc-backends/barcode-0.98/i25.c
+D      bc-backends/barcode-0.98/install-sh
+D      bc-backends/barcode-0.98/library.c
+D      bc-backends/barcode-0.98/main.c
+D      bc-backends/barcode-0.98/missing
+D      bc-backends/barcode-0.98/mkinstalldirs
+D      bc-backends/barcode-0.98/msi.c
+D      bc-backends/barcode-0.98/pcl.c
+D      bc-backends/barcode-0.98/plessey.c
+D      bc-backends/barcode-0.98/ps.c
+D      bc-backends/barcode-0.98/sample.c
+D      bc-backends/iec16022-0.2.1/BUGS
+D      bc-backends/iec16022-0.2.1/CHANGELOG
+D      bc-backends/iec16022-0.2.1/CREDITS
+D      bc-backends/iec16022-0.2.1/INSTALL
+D      bc-backends/iec16022-0.2.1/LICENSE
+D      bc-backends/iec16022-0.2.1/Makefile.am
+D      bc-backends/iec16022-0.2.1/Makefile.dist
+D      bc-backends/iec16022-0.2.1/README
+D      bc-backends/iec16022-0.2.1/README.glabels
+D      bc-backends/iec16022-0.2.1/TODO
+D      bc-backends/iec16022-0.2.1/iec16022.1
+D      bc-backends/iec16022-0.2.1/iec16022.c
+D      bc-backends/iec16022-0.2.1/iec16022ecc200.c
+D      bc-backends/iec16022-0.2.1/iec16022ecc200.h
+D      bc-backends/iec16022-0.2.1/image.c
+D      bc-backends/iec16022-0.2.1/image.h
+D      bc-backends/iec16022-0.2.1/reedsol.c
+D      bc-backends/iec16022-0.2.1/reedsol.h
+D      bc-backends/iec16022-0.2.1/test/testsuite-example.bin
+D      bc-backends/iec16022-0.2.1/test/testsuite-example.eps
+D      bc-backends/iec16022-0.2.1/test/testsuite-example.hex
+D      bc-backends/iec16022-0.2.1/test/testsuite-example.png
+D      bc-backends/iec16022-0.2.1/test/testsuite-example.text
+D      bc-backends/iec16022-0.2.1/test/testsuite.sh
+D      bc-backends/qrencode-3.1.0/COPYING
+D      bc-backends/qrencode-3.1.0/ChangeLog
+D      bc-backends/qrencode-3.1.0/Doxyfile
+D      bc-backends/qrencode-3.1.0/Makefile.am
+D      bc-backends/qrencode-3.1.0/Makefile.am.dist
+D      bc-backends/qrencode-3.1.0/Makefile.in.dist
+D      bc-backends/qrencode-3.1.0/NEWS
+D      bc-backends/qrencode-3.1.0/README
+D      bc-backends/qrencode-3.1.0/README.glabels
+D      bc-backends/qrencode-3.1.0/TODO
+D      bc-backends/qrencode-3.1.0/acinclude.m4
+D      bc-backends/qrencode-3.1.0/aclocal.m4
+D      bc-backends/qrencode-3.1.0/autogen.sh
+D      bc-backends/qrencode-3.1.0/bitstream.c
+D      bc-backends/qrencode-3.1.0/bitstream.h
+D      bc-backends/qrencode-3.1.0/config.h.in
+D      bc-backends/qrencode-3.1.0/configure
+D      bc-backends/qrencode-3.1.0/configure.ac.dist
+D      bc-backends/qrencode-3.1.0/libqrencode.pc.in
+D      bc-backends/qrencode-3.1.0/mask.c
+D      bc-backends/qrencode-3.1.0/mask.h
+D      bc-backends/qrencode-3.1.0/qrenc.c
+D      bc-backends/qrencode-3.1.0/qrencode.1.in
+D      bc-backends/qrencode-3.1.0/qrencode.c
+D      bc-backends/qrencode-3.1.0/qrencode.h
+D      bc-backends/qrencode-3.1.0/qrencode.spec
+D      bc-backends/qrencode-3.1.0/qrencode.spec.in
+D      bc-backends/qrencode-3.1.0/qrencode_inner.h
+D      bc-backends/qrencode-3.1.0/qrinput.c
+D      bc-backends/qrencode-3.1.0/qrinput.h
+D      bc-backends/qrencode-3.1.0/qrspec.c
+D      bc-backends/qrencode-3.1.0/qrspec.h
+D      bc-backends/qrencode-3.1.0/rscode.c
+D      bc-backends/qrencode-3.1.0/rscode.h
+D      bc-backends/qrencode-3.1.0/split.c
+D      bc-backends/qrencode-3.1.0/split.h
+D      bc-backends/qrencode-3.1.0/tests/Makefile.am
+D      bc-backends/qrencode-3.1.0/tests/Makefile.in
+D      bc-backends/qrencode-3.1.0/tests/common.h
+D      bc-backends/qrencode-3.1.0/tests/create_frame_pattern.c
+D      bc-backends/qrencode-3.1.0/tests/frame
+D      bc-backends/qrencode-3.1.0/tests/prof_qrencode.c
+D      bc-backends/qrencode-3.1.0/tests/test_all.sh
+D      bc-backends/qrencode-3.1.0/tests/test_bitstream.c
+D      bc-backends/qrencode-3.1.0/tests/test_estimatebit.c
+D      bc-backends/qrencode-3.1.0/tests/test_monkey.c
+D      bc-backends/qrencode-3.1.0/tests/test_qrencode.c
+D      bc-backends/qrencode-3.1.0/tests/test_qrinput.c
+D      bc-backends/qrencode-3.1.0/tests/test_qrspec.c
+D      bc-backends/qrencode-3.1.0/tests/test_rs.c
+D      bc-backends/qrencode-3.1.0/tests/test_split.c
+D      bc-backends/qrencode-3.1.0/tests/view_qrcode.c
+D      bc-backends/qrencode-3.1.0/use/compile
+D      bc-backends/qrencode-3.1.0/use/config.guess
+D      bc-backends/qrencode-3.1.0/use/config.sub
+D      bc-backends/qrencode-3.1.0/use/depcomp
+D      bc-backends/qrencode-3.1.0/use/install-sh
+D      bc-backends/qrencode-3.1.0/use/ltmain.sh
+D      bc-backends/qrencode-3.1.0/use/missing
+M      configure.in
+M      po/POTFILES.in
+M      src/Makefile.am
+M      src/bc-gnubarcode.c
+M      src/bc-iec16022.c
+M      src/bc-iec18004.c
+M      src/bc.c
+
+commit 1d8d113699adea7360355c7cef8ad539825829e0
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-06
+
+    Fixed some gettext problems
+
+    color-combo-menu.c:
+       - escape "%" in strings so that they are not interpreted as
+       c-format
+         conversions.
+       - call gettext() on color names initialized in table.
+    bc.c:
+       - call gettext() on barcode names initialized in table.
+    property-bar.builder:
+       - moved "Font family" tooltip to correct field for translation.
+
+M      data/builder/property-bar.builder
+M      src/bc.c
+M      src/color-combo-menu.c
+
+commit 48fe1b343471e074156ea342ded7faaaca390c40
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-06
+
+    Added information for translators to HACKING
+
+    Added information for translators to the HACKING file.
+
+M      HACKING
+
+commit 1a23afe96b3503f6d19a871623d31ce9eb4177e7
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-06
+
+    Converted polish translation to UTF-8
+
+M      po/pl.po
+
+commit 7b88300bed91c62816557772cfa263604aa209d2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-06
+
+    Added missing filename
+
+M      po/POTFILES.in
+
+commit d5ae0b083b9f9ba9f39cc302b233eb44bab1ff65
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2009-10-06
+
+    Convert zh_TW translation to UTF-8
+
+M      po/LINGUAS
+R089   po/zh_TW.Big5.po        po/zh_TW.po
+
+commit 05f3749a2034521a14d229ca11cde7c91051cec2
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-06
+
+    Updated German translation
+
+M      po/de.po
+
+commit f6f8ebf5318cf00d7735a7dc87885373677370c1
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-06
+
+    Updated German translation
+
+M      po/de.po
+
+commit 23449d845bce7cdde774e1dc006814ce08280f59
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-10-06
+
+    Updated German doc translation
+
+M      po/de.po
+
+commit 0bc48aa862b0a2f01b6c222aab279cb6f35a4f35
+Author: Daniel Nylander <po@danielnylander.se>
+Date:  2009-10-06
+
+    Added Swedish translation
+
+M      po/LINGUAS
+A      po/sv.po
+
+commit a869e748bc106014e98749786471aef0198725ef
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-05
+
+    Adding MAINTAINERS and HACKING files.
+
+    Added MAINTAINERS and HACKING files.  Updated glabels.doap to
+    reconcile with new MAINTAINERS file.  Updated TODO file bringing
+    up-to-date with the current roadmap.
+
+A      HACKING
+A      MAINTAINERS
+M      TODO
+M      glabels.doap
+
+commit 6684593a76fba89a941edcf8991d45f0c5521ecc
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-10-05
+
+    Adding glabels.doap
+
+    Adding glabels.doap file for gnome Git repository.
+
+A      glabels.doap
+
+commit d8ea0137a6f1aa1924f62a64c2a83e048a79f0ce
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-29
+
+    Removed non-existent filenames from po/POTFILES.in
+
+M      po/POTFILES.in
+
+commit 743c111fc1f7f0a698c459d0ef387f5591112d36
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-29
+
+    Removed non-existent filenames from po/POTFILES.in
+
+M      po/de.po
+
+commit 73e7592ce7bc2ad65ebeb85b7f17f0ef10bd8f3c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-28
+
+    Removed gtk-doc.make.
+
+    Removed the gtk-doc.make file, since it gets regenerated anyway.
+
+D      gtk-doc.make
+
+commit d45bb113212523705e156d79044849b08025f305
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-27
+
+    Relocated barcode backends.
+
+    Moved 3rd party barcode backends to a new bc-backends/ subdirectory.
+
+M      COPYING.README_FIRST
+M      Makefile.am
+A      bc-backends/Makefile.am
+R100   barcode-0.98/COPYING    bc-backends/barcode-0.98/COPYING
+R100   barcode-0.98/ChangeLog  bc-backends/barcode-0.98/ChangeLog
+R100   barcode-0.98/INSTALL    bc-backends/barcode-0.98/INSTALL
+R100   barcode-0.98/Makefile.am
+bc-backends/barcode-0.98/Makefile.am
+R100   barcode-0.98/Makefile.in.dist
+bc-backends/barcode-0.98/Makefile.in.dist
+R100   barcode-0.98/README     bc-backends/barcode-0.98/README
+R100   barcode-0.98/README.glabels
+bc-backends/barcode-0.98/README.glabels
+R100   barcode-0.98/TODO       bc-backends/barcode-0.98/TODO
+R100   barcode-0.98/barcode.h  bc-backends/barcode-0.98/barcode.h
+R100   barcode-0.98/barcode.spec
+bc-backends/barcode-0.98/barcode.spec
+R100   barcode-0.98/bookland/bookland.py
+bc-backends/barcode-0.98/bookland/bookland.py
+R100   barcode-0.98/cmdline.c  bc-backends/barcode-0.98/cmdline.c
+R100   barcode-0.98/cmdline.h  bc-backends/barcode-0.98/cmdline.h
+R100   barcode-0.98/codabar.c  bc-backends/barcode-0.98/codabar.c
+R100   barcode-0.98/code128.c  bc-backends/barcode-0.98/code128.c
+R100   barcode-0.98/code39.c   bc-backends/barcode-0.98/code39.c
+R100   barcode-0.98/code93.c   bc-backends/barcode-0.98/code93.c
+R100   barcode-0.98/compat/getopt.c
+bc-backends/barcode-0.98/compat/getopt.c
+R100   barcode-0.98/compat/getopt.h
+bc-backends/barcode-0.98/compat/getopt.h
+R100   barcode-0.98/configure  bc-backends/barcode-0.98/configure
+R100   barcode-0.98/configure.in.dist
+bc-backends/barcode-0.98/configure.in.dist
+R100   barcode-0.98/contrib/barcode-SVG.tar.gz
+bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz
+R100   barcode-0.98/contrib/barcode-SVG.tar.gz.README
+bc-backends/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+R100   barcode-0.98/contrib/barcode-for-delphi.tar.gz
+bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+R100   barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+bc-backends/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+R100   barcode-0.98/contrib/barcodeps-0.1.tgz
+bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz
+R100   barcode-0.98/contrib/barcodeps-0.1.tgz.README
+bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+R100   barcode-0.98/contrib/grab-0.0.4.tar.gz
+bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz
+R100   barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+R100   barcode-0.98/debian/README.debian
+bc-backends/barcode-0.98/debian/README.debian
+R100   barcode-0.98/debian/changelog
+bc-backends/barcode-0.98/debian/changelog
+R100   barcode-0.98/debian/control
+bc-backends/barcode-0.98/debian/control
+R100   barcode-0.98/debian/copyright
+bc-backends/barcode-0.98/debian/copyright
+R100   barcode-0.98/debian/dirs
+bc-backends/barcode-0.98/debian/dirs
+R100   barcode-0.98/debian/info
+bc-backends/barcode-0.98/debian/info
+R100   barcode-0.98/debian/rules
+bc-backends/barcode-0.98/debian/rules
+R100   barcode-0.98/doc/Makefile.in
+bc-backends/barcode-0.98/doc/Makefile.in
+R100   barcode-0.98/doc/README bc-backends/barcode-0.98/doc/README
+R100   barcode-0.98/doc/barcode.info
+bc-backends/barcode-0.98/doc/barcode.info
+R100   barcode-0.98/doc/barcode.pdf
+bc-backends/barcode-0.98/doc/barcode.pdf
+R100   barcode-0.98/doc/barcode.ps
+bc-backends/barcode-0.98/doc/barcode.ps
+R100   barcode-0.98/doc/barcodedoc.txt
+bc-backends/barcode-0.98/doc/barcodedoc.txt
+R100   barcode-0.98/doc/doc.barcode
+bc-backends/barcode-0.98/doc/doc.barcode
+R100   barcode-0.98/doc/infofilter
+bc-backends/barcode-0.98/doc/infofilter
+R100   barcode-0.98/doc/manpager
+bc-backends/barcode-0.98/doc/manpager
+R100   barcode-0.98/doc/mktxt  bc-backends/barcode-0.98/doc/mktxt
+R100   barcode-0.98/doc/texi2html
+bc-backends/barcode-0.98/doc/texi2html
+R100   barcode-0.98/ean.c      bc-backends/barcode-0.98/ean.c
+R100   barcode-0.98/i25.c      bc-backends/barcode-0.98/i25.c
+R100   barcode-0.98/install-sh bc-backends/barcode-0.98/install-sh
+R100   barcode-0.98/library.c  bc-backends/barcode-0.98/library.c
+R100   barcode-0.98/main.c     bc-backends/barcode-0.98/main.c
+R100   barcode-0.98/missing    bc-backends/barcode-0.98/missing
+R100   barcode-0.98/mkinstalldirs
+bc-backends/barcode-0.98/mkinstalldirs
+R100   barcode-0.98/msi.c      bc-backends/barcode-0.98/msi.c
+R100   barcode-0.98/pcl.c      bc-backends/barcode-0.98/pcl.c
+R100   barcode-0.98/plessey.c  bc-backends/barcode-0.98/plessey.c
+R100   barcode-0.98/ps.c       bc-backends/barcode-0.98/ps.c
+R100   barcode-0.98/sample.c   bc-backends/barcode-0.98/sample.c
+R100   iec16022-0.2.1/BUGS     bc-backends/iec16022-0.2.1/BUGS
+R100   iec16022-0.2.1/CHANGELOG
+bc-backends/iec16022-0.2.1/CHANGELOG
+R100   iec16022-0.2.1/CREDITS  bc-backends/iec16022-0.2.1/CREDITS
+R100   iec16022-0.2.1/INSTALL  bc-backends/iec16022-0.2.1/INSTALL
+R100   iec16022-0.2.1/LICENSE  bc-backends/iec16022-0.2.1/LICENSE
+R100   iec16022-0.2.1/Makefile.am
+bc-backends/iec16022-0.2.1/Makefile.am
+R100   iec16022-0.2.1/Makefile.dist
+bc-backends/iec16022-0.2.1/Makefile.dist
+R100   iec16022-0.2.1/README   bc-backends/iec16022-0.2.1/README
+R100   iec16022-0.2.1/README.glabels
+bc-backends/iec16022-0.2.1/README.glabels
+R100   iec16022-0.2.1/TODO     bc-backends/iec16022-0.2.1/TODO
+R100   iec16022-0.2.1/iec16022.1
+bc-backends/iec16022-0.2.1/iec16022.1
+R100   iec16022-0.2.1/iec16022.c
+bc-backends/iec16022-0.2.1/iec16022.c
+R100   iec16022-0.2.1/iec16022ecc200.c
+bc-backends/iec16022-0.2.1/iec16022ecc200.c
+R100   iec16022-0.2.1/iec16022ecc200.h
+bc-backends/iec16022-0.2.1/iec16022ecc200.h
+R100   iec16022-0.2.1/image.c  bc-backends/iec16022-0.2.1/image.c
+R100   iec16022-0.2.1/image.h  bc-backends/iec16022-0.2.1/image.h
+R100   iec16022-0.2.1/reedsol.c
+bc-backends/iec16022-0.2.1/reedsol.c
+R100   iec16022-0.2.1/reedsol.h
+bc-backends/iec16022-0.2.1/reedsol.h
+R100   iec16022-0.2.1/test/testsuite-example.bin
+bc-backends/iec16022-0.2.1/test/testsuite-example.bin
+R100   iec16022-0.2.1/test/testsuite-example.eps
+bc-backends/iec16022-0.2.1/test/testsuite-example.eps
+R100   iec16022-0.2.1/test/testsuite-example.hex
+bc-backends/iec16022-0.2.1/test/testsuite-example.hex
+R100   iec16022-0.2.1/test/testsuite-example.png
+bc-backends/iec16022-0.2.1/test/testsuite-example.png
+R100   iec16022-0.2.1/test/testsuite-example.text
+bc-backends/iec16022-0.2.1/test/testsuite-example.text
+R100   iec16022-0.2.1/test/testsuite.sh
+bc-backends/iec16022-0.2.1/test/testsuite.sh
+R100   qrencode-3.1.0/COPYING  bc-backends/qrencode-3.1.0/COPYING
+R100   qrencode-3.1.0/ChangeLog
+bc-backends/qrencode-3.1.0/ChangeLog
+R100   qrencode-3.1.0/Doxyfile bc-backends/qrencode-3.1.0/Doxyfile
+R100   qrencode-3.1.0/Makefile.am
+bc-backends/qrencode-3.1.0/Makefile.am
+R100   qrencode-3.1.0/Makefile.am.dist
+bc-backends/qrencode-3.1.0/Makefile.am.dist
+R100   qrencode-3.1.0/Makefile.in.dist
+bc-backends/qrencode-3.1.0/Makefile.in.dist
+R100   qrencode-3.1.0/NEWS     bc-backends/qrencode-3.1.0/NEWS
+R100   qrencode-3.1.0/README   bc-backends/qrencode-3.1.0/README
+R100   qrencode-3.1.0/README.glabels
+bc-backends/qrencode-3.1.0/README.glabels
+R100   qrencode-3.1.0/TODO     bc-backends/qrencode-3.1.0/TODO
+R100   qrencode-3.1.0/acinclude.m4
+bc-backends/qrencode-3.1.0/acinclude.m4
+R100   qrencode-3.1.0/aclocal.m4
+bc-backends/qrencode-3.1.0/aclocal.m4
+R100   qrencode-3.1.0/autogen.sh
+bc-backends/qrencode-3.1.0/autogen.sh
+R100   qrencode-3.1.0/bitstream.c
+bc-backends/qrencode-3.1.0/bitstream.c
+R100   qrencode-3.1.0/bitstream.h
+bc-backends/qrencode-3.1.0/bitstream.h
+R100   qrencode-3.1.0/config.h.in
+bc-backends/qrencode-3.1.0/config.h.in
+R100   qrencode-3.1.0/configure
+bc-backends/qrencode-3.1.0/configure
+R100   qrencode-3.1.0/configure.ac.dist
+bc-backends/qrencode-3.1.0/configure.ac.dist
+R100   qrencode-3.1.0/libqrencode.pc.in
+bc-backends/qrencode-3.1.0/libqrencode.pc.in
+R100   qrencode-3.1.0/mask.c   bc-backends/qrencode-3.1.0/mask.c
+R100   qrencode-3.1.0/mask.h   bc-backends/qrencode-3.1.0/mask.h
+R100   qrencode-3.1.0/qrenc.c  bc-backends/qrencode-3.1.0/qrenc.c
+R100   qrencode-3.1.0/qrencode.1.in
+bc-backends/qrencode-3.1.0/qrencode.1.in
+R100   qrencode-3.1.0/qrencode.c
+bc-backends/qrencode-3.1.0/qrencode.c
+R100   qrencode-3.1.0/qrencode.h
+bc-backends/qrencode-3.1.0/qrencode.h
+R100   qrencode-3.1.0/qrencode.spec
+bc-backends/qrencode-3.1.0/qrencode.spec
+R100   qrencode-3.1.0/qrencode.spec.in
+bc-backends/qrencode-3.1.0/qrencode.spec.in
+R100   qrencode-3.1.0/qrencode_inner.h
+bc-backends/qrencode-3.1.0/qrencode_inner.h
+R100   qrencode-3.1.0/qrinput.c
+bc-backends/qrencode-3.1.0/qrinput.c
+R100   qrencode-3.1.0/qrinput.h
+bc-backends/qrencode-3.1.0/qrinput.h
+R100   qrencode-3.1.0/qrspec.c bc-backends/qrencode-3.1.0/qrspec.c
+R100   qrencode-3.1.0/qrspec.h bc-backends/qrencode-3.1.0/qrspec.h
+R100   qrencode-3.1.0/rscode.c bc-backends/qrencode-3.1.0/rscode.c
+R100   qrencode-3.1.0/rscode.h bc-backends/qrencode-3.1.0/rscode.h
+R100   qrencode-3.1.0/split.c  bc-backends/qrencode-3.1.0/split.c
+R100   qrencode-3.1.0/split.h  bc-backends/qrencode-3.1.0/split.h
+R100   qrencode-3.1.0/tests/Makefile.am
+bc-backends/qrencode-3.1.0/tests/Makefile.am
+R100   qrencode-3.1.0/tests/Makefile.in
+bc-backends/qrencode-3.1.0/tests/Makefile.in
+R100   qrencode-3.1.0/tests/common.h
+bc-backends/qrencode-3.1.0/tests/common.h
+R100   qrencode-3.1.0/tests/create_frame_pattern.c
+bc-backends/qrencode-3.1.0/tests/create_frame_pattern.c
+R100   qrencode-3.1.0/tests/frame
+bc-backends/qrencode-3.1.0/tests/frame
+R100   qrencode-3.1.0/tests/prof_qrencode.c
+bc-backends/qrencode-3.1.0/tests/prof_qrencode.c
+R100   qrencode-3.1.0/tests/test_all.sh
+bc-backends/qrencode-3.1.0/tests/test_all.sh
+R100   qrencode-3.1.0/tests/test_bitstream.c
+bc-backends/qrencode-3.1.0/tests/test_bitstream.c
+R100   qrencode-3.1.0/tests/test_estimatebit.c
+bc-backends/qrencode-3.1.0/tests/test_estimatebit.c
+R100   qrencode-3.1.0/tests/test_monkey.c
+bc-backends/qrencode-3.1.0/tests/test_monkey.c
+R100   qrencode-3.1.0/tests/test_qrencode.c
+bc-backends/qrencode-3.1.0/tests/test_qrencode.c
+R100   qrencode-3.1.0/tests/test_qrinput.c
+bc-backends/qrencode-3.1.0/tests/test_qrinput.c
+R100   qrencode-3.1.0/tests/test_qrspec.c
+bc-backends/qrencode-3.1.0/tests/test_qrspec.c
+R100   qrencode-3.1.0/tests/test_rs.c
+bc-backends/qrencode-3.1.0/tests/test_rs.c
+R100   qrencode-3.1.0/tests/test_split.c
+bc-backends/qrencode-3.1.0/tests/test_split.c
+R100   qrencode-3.1.0/tests/view_qrcode.c
+bc-backends/qrencode-3.1.0/tests/view_qrcode.c
+R100   qrencode-3.1.0/use/compile
+bc-backends/qrencode-3.1.0/use/compile
+R100   qrencode-3.1.0/use/config.guess
+bc-backends/qrencode-3.1.0/use/config.guess
+R100   qrencode-3.1.0/use/config.sub
+bc-backends/qrencode-3.1.0/use/config.sub
+R100   qrencode-3.1.0/use/depcomp
+bc-backends/qrencode-3.1.0/use/depcomp
+R100   qrencode-3.1.0/use/install-sh
+bc-backends/qrencode-3.1.0/use/install-sh
+R100   qrencode-3.1.0/use/ltmain.sh
+bc-backends/qrencode-3.1.0/use/ltmain.sh
+R100   qrencode-3.1.0/use/missing
+bc-backends/qrencode-3.1.0/use/missing
+M      configure.in
+M      src/Makefile.am
+
+commit 39f4c44e000d410b4f63ab1fcdc4b04273ff0a83
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-26
+
+    Organized master branch to be top-level directory for glabels,
+    instead of
+    having a glabels2 sub-directory.
+
+R100   glabels2/AUTHORS        AUTHORS
+R100   glabels2/COPYING        COPYING
+R100   glabels2/COPYING-DOCS   COPYING-DOCS
+R100   glabels2/COPYING-LIBGLABELS     COPYING-LIBGLABELS
+R100   glabels2/COPYING-TEMPLATES      COPYING-TEMPLATES
+R100   glabels2/COPYING.README_FIRST   COPYING.README_FIRST
+R100   glabels2/ChangeLog      ChangeLog
+R100   glabels2/INSTALL        INSTALL
+R100   glabels2/MESSAGE-OF-DOOM        MESSAGE-OF-DOOM
+R100   glabels2/Makefile.am    Makefile.am
+R100   glabels2/NEWS   NEWS
+R100   glabels2/README README
+R100   glabels2/TODO   TODO
+R100   glabels2/autogen.sh     autogen.sh
+R100   glabels1/barcode-0.98/COPYING   barcode-0.98/COPYING
+R100   glabels1/barcode-0.98/ChangeLog barcode-0.98/ChangeLog
+R100   glabels1/barcode-0.98/INSTALL   barcode-0.98/INSTALL
+R100   glabels2/barcode-0.98/Makefile.am       barcode-0.98/Makefile.am
+R100   glabels2/barcode-0.98/Makefile.in.dist
 barcode-0.98/Makefile.in.dist
-R100   glabels2/barcode-0.98/README    barcode-0.98/README
+R100   glabels1/barcode-0.98/README    barcode-0.98/README
 R100   glabels2/barcode-0.98/README.glabels
 barcode-0.98/README.glabels
-R100   glabels2/barcode-0.98/TODO      barcode-0.98/TODO
-R100   glabels2/barcode-0.98/barcode.h barcode-0.98/barcode.h
-R100   glabels2/barcode-0.98/barcode.spec      barcode-0.98/barcode.spec
-R100   glabels2/barcode-0.98/bookland/bookland.py
+R100   glabels1/barcode-0.98/TODO      barcode-0.98/TODO
+R100   glabels1/barcode-0.98/barcode.h barcode-0.98/barcode.h
+R100   glabels1/barcode-0.98/barcode.spec      barcode-0.98/barcode.spec
+R100   glabels1/barcode-0.98/bookland/bookland.py
 barcode-0.98/bookland/bookland.py
-R100   glabels2/barcode-0.98/cmdline.c barcode-0.98/cmdline.c
-R100   glabels2/barcode-0.98/cmdline.h barcode-0.98/cmdline.h
-R100   glabels2/barcode-0.98/codabar.c barcode-0.98/codabar.c
-R100   glabels2/barcode-0.98/code128.c barcode-0.98/code128.c
-R100   glabels2/barcode-0.98/code39.c  barcode-0.98/code39.c
-R100   glabels2/barcode-0.98/code93.c  barcode-0.98/code93.c
-R100   glabels2/barcode-0.98/compat/getopt.c
+R100   glabels1/barcode-0.98/cmdline.c barcode-0.98/cmdline.c
+R100   glabels1/barcode-0.98/cmdline.h barcode-0.98/cmdline.h
+R100   glabels1/barcode-0.98/codabar.c barcode-0.98/codabar.c
+R100   glabels1/barcode-0.98/code128.c barcode-0.98/code128.c
+R100   glabels1/barcode-0.98/code39.c  barcode-0.98/code39.c
+R100   glabels1/barcode-0.98/code93.c  barcode-0.98/code93.c
+R100   glabels1/barcode-0.98/compat/getopt.c
 barcode-0.98/compat/getopt.c
-R100   glabels2/barcode-0.98/compat/getopt.h
+R100   glabels1/barcode-0.98/compat/getopt.h
 barcode-0.98/compat/getopt.h
 R100   glabels2/barcode-0.98/configure barcode-0.98/configure
 R100   glabels2/barcode-0.98/configure.in.dist
 barcode-0.98/configure.in.dist
-R100   glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
+R100   glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
 barcode-0.98/contrib/barcode-SVG.tar.gz
-R100   glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+R100   glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
 barcode-0.98/contrib/barcode-SVG.tar.gz.README
-R100   glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+R100   glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
 barcode-0.98/contrib/barcode-for-delphi.tar.gz
-R100   glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+R100   glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
 barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
-R100   glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
+R100   glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
 barcode-0.98/contrib/barcodeps-0.1.tgz
-R100   glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+R100   glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
 barcode-0.98/contrib/barcodeps-0.1.tgz.README
-R100   glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
+R100   glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
 barcode-0.98/contrib/grab-0.0.4.tar.gz
-R100   glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+R100   glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
 barcode-0.98/contrib/grab-0.0.4.tar.gz.README
-R100   glabels2/barcode-0.98/debian/README.debian
+R100   glabels1/barcode-0.98/debian/README.debian
 barcode-0.98/debian/README.debian
-R100   glabels2/barcode-0.98/debian/changelog
+R100   glabels1/barcode-0.98/debian/changelog
 barcode-0.98/debian/changelog
-R100   glabels2/barcode-0.98/debian/control
+R100   glabels1/barcode-0.98/debian/control
 barcode-0.98/debian/control
-R100   glabels2/barcode-0.98/debian/copyright
+R100   glabels1/barcode-0.98/debian/copyright
 barcode-0.98/debian/copyright
-R100   glabels2/barcode-0.98/debian/dirs       barcode-0.98/debian/dirs
-R100   glabels2/barcode-0.98/debian/info       barcode-0.98/debian/info
-R100   glabels2/barcode-0.98/debian/rules      barcode-0.98/debian/rules
-R100   glabels2/barcode-0.98/doc/Makefile.in
+R100   glabels1/barcode-0.98/debian/dirs       barcode-0.98/debian/dirs
+R100   glabels1/barcode-0.98/debian/info       barcode-0.98/debian/info
+R100   glabels1/barcode-0.98/debian/rules      barcode-0.98/debian/rules
+R100   glabels1/barcode-0.98/doc/Makefile.in
 barcode-0.98/doc/Makefile.in
-R100   glabels2/barcode-0.98/doc/README        barcode-0.98/doc/README
+R100   glabels1/barcode-0.98/doc/README        barcode-0.98/doc/README
 R100   glabels2/barcode-0.98/doc/barcode.info
 barcode-0.98/doc/barcode.info
 R100   glabels2/barcode-0.98/doc/barcode.pdf
@@ -813,51 +6726,45 @@ R100     glabels2/barcode-0.98/doc/barcode.ps
 barcode-0.98/doc/barcode.ps
 R100   glabels2/barcode-0.98/doc/barcodedoc.txt
 barcode-0.98/doc/barcodedoc.txt
-R100   glabels2/barcode-0.98/doc/doc.barcode
+R100   glabels1/barcode-0.98/doc/doc.barcode
 barcode-0.98/doc/doc.barcode
-R100   glabels2/barcode-0.98/doc/infofilter
+R100   glabels1/barcode-0.98/doc/infofilter
 barcode-0.98/doc/infofilter
-R100   glabels2/barcode-0.98/doc/manpager      barcode-0.98/doc/manpager
-R100   glabels2/barcode-0.98/doc/mktxt barcode-0.98/doc/mktxt
-R100   glabels2/barcode-0.98/doc/texi2html     barcode-0.98/doc/texi2html
-R100   glabels2/barcode-0.98/ean.c     barcode-0.98/ean.c
-R100   glabels2/barcode-0.98/i25.c     barcode-0.98/i25.c
-R100   glabels2/barcode-0.98/install-sh        barcode-0.98/install-sh
-R100   glabels2/barcode-0.98/library.c barcode-0.98/library.c
-R100   glabels2/barcode-0.98/main.c    barcode-0.98/main.c
+R100   glabels1/barcode-0.98/doc/manpager      barcode-0.98/doc/manpager
+R100   glabels1/barcode-0.98/doc/mktxt barcode-0.98/doc/mktxt
+R100   glabels1/barcode-0.98/doc/texi2html     barcode-0.98/doc/texi2html
+R100   glabels1/barcode-0.98/ean.c     barcode-0.98/ean.c
+R100   glabels1/barcode-0.98/i25.c     barcode-0.98/i25.c
+R100   glabels1/barcode-0.98/install-sh        barcode-0.98/install-sh
+R100   glabels1/barcode-0.98/library.c barcode-0.98/library.c
+R100   glabels1/barcode-0.98/main.c    barcode-0.98/main.c
 R100   glabels2/barcode-0.98/missing   barcode-0.98/missing
-R100   glabels2/barcode-0.98/mkinstalldirs     barcode-0.98/mkinstalldirs
-R100   glabels2/barcode-0.98/msi.c     barcode-0.98/msi.c
-R100   glabels2/barcode-0.98/pcl.c     barcode-0.98/pcl.c
-R100   glabels2/barcode-0.98/plessey.c barcode-0.98/plessey.c
-R100   glabels2/barcode-0.98/ps.c      barcode-0.98/ps.c
-R100   glabels2/barcode-0.98/sample.c  barcode-0.98/sample.c
+R100   glabels1/mkinstalldirs  barcode-0.98/mkinstalldirs
+R100   glabels1/barcode-0.98/msi.c     barcode-0.98/msi.c
+R100   glabels1/barcode-0.98/pcl.c     barcode-0.98/pcl.c
+R100   glabels1/barcode-0.98/plessey.c barcode-0.98/plessey.c
+R100   glabels1/barcode-0.98/ps.c      barcode-0.98/ps.c
+R100   glabels1/barcode-0.98/sample.c  barcode-0.98/sample.c
 R100   glabels2/configure.in   configure.in
 R100   glabels2/data/Makefile.am       data/Makefile.am
+R100   glabels2/data/builder/Makefile.am       data/builder/Makefile.am
+R100   glabels2/data/builder/merge-properties-dialog.builder
+data/builder/merge-properties-dialog.builder
+R100   glabels2/data/builder/object-editor.builder
+data/builder/object-editor.builder
+R100   glabels2/data/builder/prefs-dialog.builder
+data/builder/prefs-dialog.builder
+R100   glabels2/data/builder/print-op-dialog-custom-widget.builder
+data/builder/print-op-dialog-custom-widget.builder
+R100   glabels2/data/builder/property-bar.builder
+data/builder/property-bar.builder
+R100   glabels2/data/builder/template-designer.builder
+data/builder/template-designer.builder
+R100   glabels2/data/builder/wdgt-media-select.builder
+data/builder/wdgt-media-select.builder
 R100   glabels2/data/desktop/Makefile.am       data/desktop/Makefile.am
 R100   glabels2/data/desktop/glabels.desktop.in
 data/desktop/glabels.desktop.in
-R100   glabels2/data/dtd/Makefile.am   data/dtd/Makefile.am
-R100   glabels2/data/dtd/glabels-2.2.dtd       data/dtd/glabels-2.2.dtd
-R100   glabels2/data/glade/Makefile.am data/glade/Makefile.am
-R100   glabels2/data/glade/merge-properties-dialog.glade
-data/glade/merge-properties-dialog.glade
-R100   glabels2/data/glade/new-label-dialog.glade
-data/glade/new-label-dialog.glade
-R100   glabels2/data/glade/object-editor.glade
-data/glade/object-editor.glade
-R100   glabels2/data/glade/prefs-dialog.glade
-data/glade/prefs-dialog.glade
-R100   glabels2/data/glade/print-custom-widget.glade
-data/glade/print-custom-widget.glade
-R100   glabels2/data/glade/property-bar.glade
-data/glade/property-bar.glade
-R100   glabels2/data/glade/template-designer.glade
-data/glade/template-designer.glade
-R100   glabels2/data/glade/wdgt-media-select.glade
-data/glade/wdgt-media-select.glade
-R100   glabels2/data/glade/wdgt-rotate-label.glade
-data/glade/wdgt-rotate-label.glade
 R100   glabels2/data/man/Makefile.am   data/man/Makefile.am
 R100   glabels2/data/man/glabels.1     data/man/glabels.1
 R100   glabels2/data/mime/Makefile.am  data/mime/Makefile.am
@@ -884,29 +6791,6 @@ data/pixmaps/glabels-application-x-glabels.png
 R100   glabels2/data/pixmaps/glabels-splash.png
 data/pixmaps/glabels-splash.png
 R100   glabels2/data/pixmaps/glabels.png       data/pixmaps/glabels.png
-R100   glabels2/data/templates/Makefile.am     data/templates/Makefile.am
-R100   glabels2/data/templates/avery-iso-templates.xml
-data/templates/avery-iso-templates.xml
-R100   glabels2/data/templates/avery-other-templates.xml
-data/templates/avery-other-templates.xml
-R100   glabels2/data/templates/avery-us-templates.xml
-data/templates/avery-us-templates.xml
-R100   glabels2/data/templates/brother-other-templates.xml
-data/templates/brother-other-templates.xml
-R100   glabels2/data/templates/categories.xml
-data/templates/categories.xml
-R100   glabels2/data/templates/dymo-other-templates.xml
-data/templates/dymo-other-templates.xml
-R100   glabels2/data/templates/misc-iso-templates.xml
-data/templates/misc-iso-templates.xml
-R100   glabels2/data/templates/misc-other-templates.xml
-data/templates/misc-other-templates.xml
-R100   glabels2/data/templates/misc-us-templates.xml
-data/templates/misc-us-templates.xml
-R100   glabels2/data/templates/paper-sizes.xml
-data/templates/paper-sizes.xml
-R100   glabels2/data/templates/zweckform-iso-templates.xml
-data/templates/zweckform-iso-templates.xml
 R100   glabels2/docs/Makefile.am       docs/Makefile.am
 R100   glabels2/docs/libglabels/Makefile.am
 docs/libglabels/Makefile.am
@@ -947,8 +6831,289 @@ docs/libglabels/tmpl/xml-template.sgml
 R100   glabels2/docs/libglabels/tmpl/xml.sgml
 docs/libglabels/tmpl/xml.sgml
 R100   glabels2/glabels.spec.in        glabels.spec.in
+D      glabels1/ABOUT-NLS
+D      glabels1/AUTHORS
+D      glabels1/COPYING
+D      glabels1/ChangeLog
+D      glabels1/INSTALL
+D      glabels1/Makefile.am
+D      glabels1/NEWS
+D      glabels1/README
+D      glabels1/TODO
+D      glabels1/acconfig.h
+D      glabels1/aclocal.m4
+D      glabels1/autogen.sh
+D      glabels1/barcode-0.98/Makefile.in
+D      glabels1/barcode-0.98/configure
+D      glabels1/barcode-0.98/configure.in
+D      glabels1/barcode-0.98/doc/barcode.info
+D      glabels1/barcode-0.98/doc/barcode.pdf
+D      glabels1/barcode-0.98/doc/barcode.ps
+D      glabels1/barcode-0.98/doc/barcodedoc.txt
+D      glabels1/config.h.in
+D      glabels1/configure.in
+D      glabels1/data/predefined-labels.template
+D      glabels1/doc/C/Makefile.am
+D      glabels1/doc/C/Makefile.in
+D      glabels1/doc/C/glabels.sgml
+D      glabels1/doc/C/glabels/index.html
+D      glabels1/doc/C/glabels/ln7.html
+D      glabels1/doc/C/topic.dat
+D      glabels1/doc/Makefile.am
+D      glabels1/doc/Makefile.in
+D      glabels1/glabels.desktop
+D      glabels1/glabels.spec.in
+D      glabels1/install-sh
+D      glabels1/intl/ChangeLog
+D      glabels1/intl/Makefile.in
+D      glabels1/intl/VERSION
+D      glabels1/intl/bindtextdom.c
+D      glabels1/intl/cat-compat.c
+D      glabels1/intl/dcgettext.c
+D      glabels1/intl/dgettext.c
+D      glabels1/intl/explodename.c
+D      glabels1/intl/finddomain.c
+D      glabels1/intl/gettext.c
+D      glabels1/intl/gettext.h
+D      glabels1/intl/gettextP.h
+D      glabels1/intl/hash-string.h
+D      glabels1/intl/intl-compat.c
+D      glabels1/intl/l10nflist.c
+D      glabels1/intl/libgettext.h
+D      glabels1/intl/linux-msg.sed
+D      glabels1/intl/loadinfo.h
+D      glabels1/intl/loadmsgcat.c
+D      glabels1/intl/localealias.c
+D      glabels1/intl/po2tbl.sed.in
+D      glabels1/intl/textdomain.c
+D      glabels1/intl/xopen-msg.sed
+D      glabels1/macros/Makefile.am
+D      glabels1/macros/Makefile.in
+D      glabels1/macros/aclocal-include.m4
+D      glabels1/macros/autogen.sh
+D      glabels1/macros/compiler-flags.m4
+D      glabels1/macros/curses.m4
+D      glabels1/macros/gnome-bonobo-check.m4
+D      glabels1/macros/gnome-common.m4
+D      glabels1/macros/gnome-fileutils.m4
+D      glabels1/macros/gnome-gettext.m4
+D      glabels1/macros/gnome-ghttp-check.m4
+D      glabels1/macros/gnome-gnorba-check.m4
+D      glabels1/macros/gnome-guile-checks.m4
+D      glabels1/macros/gnome-libgtop-check.m4
+D      glabels1/macros/gnome-objc-checks.m4
+D      glabels1/macros/gnome-orbit-check.m4
+D      glabels1/macros/gnome-print-check.m4
+D      glabels1/macros/gnome-pthread-check.m4
+D      glabels1/macros/gnome-support.m4
+D      glabels1/macros/gnome-undelfs.m4
+D      glabels1/macros/gnome-vfs.m4
+D      glabels1/macros/gnome-x-checks.m4
+D      glabels1/macros/gnome-xml-check.m4
+D      glabels1/macros/gnome.m4
+D      glabels1/macros/linger.m4
+D      glabels1/macros/need-declaration.m4
+D      glabels1/missing
+D      glabels1/pixmaps/glabels-about-logo.png
+D      glabels1/pixmaps/glabels-icon.png
+D      glabels1/pixmaps/glabels-logo.png
+D      glabels1/po/ChangeLog
+D      glabels1/po/Makefile.in.in
+D      glabels1/po/POTFILES.in
+D      glabels1/po/cat-id-tbl.c
+D      glabels1/po/de.po
+D      glabels1/po/es.po
+D      glabels1/po/fr.po
+D      glabels1/po/glabels.pot
+D      glabels1/po/ja.po
+D      glabels1/po/pl.po
+D      glabels1/po/pt_BR.po
+D      glabels1/po/ru.po
+D      glabels1/po/stamp-cat-id
+D      glabels1/po/zh_TW.Big5.po
+D      glabels1/src/Makefile.am
+D      glabels1/src/bc.c
+D      glabels1/src/bc.h
+D      glabels1/src/bc_gnubarcode.c
+D      glabels1/src/bc_gnubarcode.h
+D      glabels1/src/bc_postnet.c
+D      glabels1/src/bc_postnet.h
+D      glabels1/src/debug.h
+D      glabels1/src/display.c
+D      glabels1/src/display.h
+D      glabels1/src/edit.c
+D      glabels1/src/edit.h
+D      glabels1/src/file.c
+D      glabels1/src/file.h
+D      glabels1/src/glabels.c
+D      glabels1/src/glabels_batch.c
+D      glabels1/src/gnome-canvas-hacktext.h
+D      glabels1/src/hack.c
+D      glabels1/src/hack.h
+D      glabels1/src/highlight.c
+D      glabels1/src/highlight.h
+D      glabels1/src/item.c
+D      glabels1/src/item.h
+D      glabels1/src/item_barcode.c
+D      glabels1/src/item_barcode.h
+D      glabels1/src/item_box.c
+D      glabels1/src/item_box.h
+D      glabels1/src/item_ellipse.c
+D      glabels1/src/item_ellipse.h
+D      glabels1/src/item_image.c
+D      glabels1/src/item_image.h
+D      glabels1/src/item_line.c
+D      glabels1/src/item_line.h
+D      glabels1/src/item_text.c
+D      glabels1/src/item_text.h
+D      glabels1/src/label.c
+D      glabels1/src/label.h
+D      glabels1/src/mdi.c
+D      glabels1/src/mdi.h
+D      glabels1/src/media_select.c
+D      glabels1/src/media_select.h
+D      glabels1/src/menu.c
+D      glabels1/src/menu.h
+D      glabels1/src/merge.c
+D      glabels1/src/merge.h
+D      glabels1/src/merge_properties.c
+D      glabels1/src/merge_properties.h
+D      glabels1/src/merge_text.c
+D      glabels1/src/merge_text.h
+D      glabels1/src/merge_ui.c
+D      glabels1/src/merge_ui.h
+D      glabels1/src/merge_ui_text.c
+D      glabels1/src/merge_ui_text.h
+D      glabels1/src/mini_preview.c
+D      glabels1/src/mini_preview.h
+D      glabels1/src/pixmaps/Makefile.am
+D      glabels1/src/pixmaps/arrow.xpm
+D      glabels1/src/pixmaps/barcode.xpm
+D      glabels1/src/pixmaps/box.xpm
+D      glabels1/src/pixmaps/cursor_zoomin.xbm
+D      glabels1/src/pixmaps/cursor_zoomin_mask.xbm
+D      glabels1/src/pixmaps/cursor_zoomout.xbm
+D      glabels1/src/pixmaps/cursor_zoomout_mask.xbm
+D      glabels1/src/pixmaps/ellipse.xpm
+D      glabels1/src/pixmaps/image.xpm
+D      glabels1/src/pixmaps/line.xpm
+D      glabels1/src/pixmaps/merge.xpm
+D      glabels1/src/pixmaps/text.xpm
+D      glabels1/src/pixmaps/zoom1to1.xpm
+D      glabels1/src/pixmaps/zoomin.xpm
+D      glabels1/src/pixmaps/zoomout.xpm
+D      glabels1/src/prefs.c
+D      glabels1/src/prefs.h
+D      glabels1/src/print.c
+D      glabels1/src/print.h
+D      glabels1/src/print_copies.c
+D      glabels1/src/print_copies.h
+D      glabels1/src/print_dialog.c
+D      glabels1/src/print_dialog.h
+D      glabels1/src/print_merge.c
+D      glabels1/src/print_merge.h
+D      glabels1/src/prop_bc.c
+D      glabels1/src/prop_bc.h
+D      glabels1/src/prop_bc_data.c
+D      glabels1/src/prop_bc_data.h
+D      glabels1/src/prop_bc_style.c
+D      glabels1/src/prop_bc_style.h
+D      glabels1/src/prop_fill.c
+D      glabels1/src/prop_fill.h
+D      glabels1/src/prop_line.c
+D      glabels1/src/prop_line.h
+D      glabels1/src/prop_position.c
+D      glabels1/src/prop_position.h
+D      glabels1/src/prop_size.c
+D      glabels1/src/prop_size.h
+D      glabels1/src/prop_text.c
+D      glabels1/src/prop_text.h
+D      glabels1/src/prop_text_entry.c
+D      glabels1/src/prop_text_entry.h
+D      glabels1/src/prop_vector.c
+D      glabels1/src/prop_vector.h
+D      glabels1/src/propertybox.c
+D      glabels1/src/propertybox.h
+D      glabels1/src/rotate_select.c
+D      glabels1/src/rotate_select.h
+D      glabels1/src/splash.c
+D      glabels1/src/splash.h
+D      glabels1/src/stock.c
+D      glabels1/src/stock.h
+D      glabels1/src/template.c
+D      glabels1/src/template.h
+D      glabels1/src/text_node.c
+D      glabels1/src/text_node.h
+D      glabels1/src/tools.c
+D      glabels1/src/tools.h
+D      glabels1/src/util.c
+D      glabels1/src/util.h
+D      glabels1/stamp-h.in
+D      glabels2/barcode-0.98/COPYING
+D      glabels2/barcode-0.98/ChangeLog
+D      glabels2/barcode-0.98/INSTALL
+D      glabels2/barcode-0.98/README
+D      glabels2/barcode-0.98/TODO
+D      glabels2/barcode-0.98/barcode.h
+D      glabels2/barcode-0.98/barcode.spec
+D      glabels2/barcode-0.98/bookland/bookland.py
+D      glabels2/barcode-0.98/cmdline.c
+D      glabels2/barcode-0.98/cmdline.h
+D      glabels2/barcode-0.98/codabar.c
+D      glabels2/barcode-0.98/code128.c
+D      glabels2/barcode-0.98/code39.c
+D      glabels2/barcode-0.98/code93.c
+D      glabels2/barcode-0.98/compat/getopt.c
+D      glabels2/barcode-0.98/compat/getopt.h
+D      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
+D      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+D      glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+D      glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+D      glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
+D      glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+D      glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
+D      glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+D      glabels2/barcode-0.98/debian/README.debian
+D      glabels2/barcode-0.98/debian/changelog
+D      glabels2/barcode-0.98/debian/control
+D      glabels2/barcode-0.98/debian/copyright
+D      glabels2/barcode-0.98/debian/dirs
+D      glabels2/barcode-0.98/debian/info
+D      glabels2/barcode-0.98/debian/rules
+D      glabels2/barcode-0.98/doc/Makefile.in
+D      glabels2/barcode-0.98/doc/README
+D      glabels2/barcode-0.98/doc/doc.barcode
+D      glabels2/barcode-0.98/doc/infofilter
+D      glabels2/barcode-0.98/doc/manpager
+D      glabels2/barcode-0.98/doc/mktxt
+D      glabels2/barcode-0.98/doc/texi2html
+D      glabels2/barcode-0.98/ean.c
+D      glabels2/barcode-0.98/i25.c
+D      glabels2/barcode-0.98/install-sh
+D      glabels2/barcode-0.98/library.c
+D      glabels2/barcode-0.98/main.c
+D      glabels2/barcode-0.98/mkinstalldirs
+D      glabels2/barcode-0.98/msi.c
+D      glabels2/barcode-0.98/pcl.c
+D      glabels2/barcode-0.98/plessey.c
+D      glabels2/barcode-0.98/ps.c
+D      glabels2/barcode-0.98/sample.c
+D      glabels2/src/pixmaps/checkerboard.xpm
+D      glabels2/src/pixmaps/collate.xpm
+D      glabels2/src/pixmaps/cursor_barcode.xbm
+D      glabels2/src/pixmaps/cursor_barcode_mask.xbm
+D      glabels2/src/pixmaps/cursor_box.xbm
+D      glabels2/src/pixmaps/cursor_box_mask.xbm
+D      glabels2/src/pixmaps/cursor_ellipse.xbm
+D      glabels2/src/pixmaps/cursor_ellipse_mask.xbm
+D      glabels2/src/pixmaps/cursor_image.xbm
+D      glabels2/src/pixmaps/cursor_image_mask.xbm
+D      glabels2/src/pixmaps/cursor_line.xbm
+D      glabels2/src/pixmaps/cursor_line_mask.xbm
+D      glabels2/src/pixmaps/cursor_text.xbm
+D      glabels2/src/pixmaps/cursor_text_mask.xbm
+D      glabels2/src/pixmaps/nocollate.xpm
 R100   glabels2/gtk-doc.make   gtk-doc.make
-R100   glabels2/help/C/Makefile.am     help/C/Makefile.am
 R100   glabels2/help/C/figures/glabels-template-cd.png
 help/C/figures/glabels-template-cd.png
 R100   glabels2/help/C/figures/glabels-template-label.png
@@ -979,10 +7144,35 @@ R100     glabels2/help/C/figures/print-copies.png
 help/C/figures/print-copies.png
 R100   glabels2/help/C/figures/print-merge.png
 help/C/figures/print-merge.png
-R100   glabels2/help/C/glabels-C.omf   help/C/glabels-C.omf
 R100   glabels2/help/C/glabels.xml     help/C/glabels.xml
 R100   glabels2/help/C/legal.xml       help/C/legal.xml
 R100   glabels2/help/Makefile.am       help/Makefile.am
+R100   glabels2/help/de/de.po  help/de/de.po
+R100   glabels2/help/de/figures/main-window-empty.png
+help/de/figures/main-window-empty.png
+R100   glabels2/help/de/figures/merge-ex1-1.png
+help/de/figures/merge-ex1-1.png
+R100   glabels2/help/de/figures/merge-ex1-2.png
+help/de/figures/merge-ex1-2.png
+R100   glabels2/help/de/figures/merge-ex1-3.png
+help/de/figures/merge-ex1-3.png
+R100   glabels2/help/de/figures/merge-ex1-4.png
+help/de/figures/merge-ex1-4.png
+R100   glabels2/help/de/figures/merge-ex2-1.png
+help/de/figures/merge-ex2-1.png
+R100   glabels2/help/de/figures/merge-ex2-2.png
+help/de/figures/merge-ex2-2.png
+R100   glabels2/help/de/figures/merge-ex2-3.png
+help/de/figures/merge-ex2-3.png
+R100   glabels2/help/de/figures/merge-ex2-4.png
+help/de/figures/merge-ex2-4.png
+R100   glabels2/help/de/figures/object-editor-sidebar.png
+help/de/figures/object-editor-sidebar.png
+R100   glabels2/help/de/figures/print-copies.png
+help/de/figures/print-copies.png
+R100   glabels2/help/de/figures/print-merge.png
+help/de/figures/print-merge.png
+R100   glabels2/help/glabels.omf.in    help/glabels.omf.in
 R100   glabels2/iec16022-0.2.1/BUGS    iec16022-0.2.1/BUGS
 R100   glabels2/iec16022-0.2.1/CHANGELOG       iec16022-0.2.1/CHANGELOG
 R100   glabels2/iec16022-0.2.1/CREDITS iec16022-0.2.1/CREDITS
@@ -1042,7 +7232,9 @@ R100      glabels2/libglabels/xml-template.c      libglabels/xml-template.c
 R100   glabels2/libglabels/xml-template.h      libglabels/xml-template.h
 R100   glabels2/libglabels/xml.c       libglabels/xml.c
 R100   glabels2/libglabels/xml.h       libglabels/xml.h
+R100   glabels2/po/LINGUAS     po/LINGUAS
 R100   glabels2/po/POTFILES.in po/POTFILES.in
+R100   glabels2/po/ca.po       po/ca.po
 R100   glabels2/po/cs.po       po/cs.po
 R100   glabels2/po/de.po       po/de.po
 R100   glabels2/po/eo.po       po/eo.po
@@ -1054,34 +7246,153 @@ R100   glabels2/po/ko.po       po/ko.po
 R100   glabels2/po/pl.po       po/pl.po
 R100   glabels2/po/pt_BR.po    po/pt_BR.po
 R100   glabels2/po/ru.po       po/ru.po
+R100   glabels2/po/zh_CN.po    po/zh_CN.po
 R100   glabels2/po/zh_TW.Big5.po       po/zh_TW.Big5.po
+R100   glabels2/qrencode-3.1.0/COPYING qrencode-3.1.0/COPYING
+R100   glabels2/qrencode-3.1.0/ChangeLog       qrencode-3.1.0/ChangeLog
+R100   glabels2/qrencode-3.1.0/Doxyfile        qrencode-3.1.0/Doxyfile
+R100   glabels2/qrencode-3.1.0/Makefile.am     qrencode-3.1.0/Makefile.am
+R100   glabels2/qrencode-3.1.0/Makefile.am.dist
+qrencode-3.1.0/Makefile.am.dist
+R100   glabels2/qrencode-3.1.0/Makefile.in.dist
+qrencode-3.1.0/Makefile.in.dist
+R100   glabels2/qrencode-3.1.0/NEWS    qrencode-3.1.0/NEWS
+R100   glabels2/qrencode-3.1.0/README  qrencode-3.1.0/README
+R100   glabels2/qrencode-3.1.0/README.glabels
+qrencode-3.1.0/README.glabels
+R100   glabels2/qrencode-3.1.0/TODO    qrencode-3.1.0/TODO
+R100   glabels2/qrencode-3.1.0/acinclude.m4
+qrencode-3.1.0/acinclude.m4
+R100   glabels2/qrencode-3.1.0/aclocal.m4      qrencode-3.1.0/aclocal.m4
+R100   glabels2/qrencode-3.1.0/autogen.sh      qrencode-3.1.0/autogen.sh
+R100   glabels2/qrencode-3.1.0/bitstream.c     qrencode-3.1.0/bitstream.c
+R100   glabels2/qrencode-3.1.0/bitstream.h     qrencode-3.1.0/bitstream.h
+R100   glabels2/qrencode-3.1.0/config.h.in     qrencode-3.1.0/config.h.in
+R100   glabels2/qrencode-3.1.0/configure       qrencode-3.1.0/configure
+R100   glabels2/qrencode-3.1.0/configure.ac.dist
+qrencode-3.1.0/configure.ac.dist
+R100   glabels2/qrencode-3.1.0/libqrencode.pc.in
+qrencode-3.1.0/libqrencode.pc.in
+R100   glabels2/qrencode-3.1.0/mask.c  qrencode-3.1.0/mask.c
+R100   glabels2/qrencode-3.1.0/mask.h  qrencode-3.1.0/mask.h
+R100   glabels2/qrencode-3.1.0/qrenc.c qrencode-3.1.0/qrenc.c
+R100   glabels2/qrencode-3.1.0/qrencode.1.in
+qrencode-3.1.0/qrencode.1.in
+R100   glabels2/qrencode-3.1.0/qrencode.c      qrencode-3.1.0/qrencode.c
+R100   glabels2/qrencode-3.1.0/qrencode.h      qrencode-3.1.0/qrencode.h
+R100   glabels2/qrencode-3.1.0/qrencode.spec
+qrencode-3.1.0/qrencode.spec
+R100   glabels2/qrencode-3.1.0/qrencode.spec.in
+qrencode-3.1.0/qrencode.spec.in
+R100   glabels2/qrencode-3.1.0/qrencode_inner.h
+qrencode-3.1.0/qrencode_inner.h
+R100   glabels2/qrencode-3.1.0/qrinput.c       qrencode-3.1.0/qrinput.c
+R100   glabels2/qrencode-3.1.0/qrinput.h       qrencode-3.1.0/qrinput.h
+R100   glabels2/qrencode-3.1.0/qrspec.c        qrencode-3.1.0/qrspec.c
+R100   glabels2/qrencode-3.1.0/qrspec.h        qrencode-3.1.0/qrspec.h
+R100   glabels2/qrencode-3.1.0/rscode.c        qrencode-3.1.0/rscode.c
+R100   glabels2/qrencode-3.1.0/rscode.h        qrencode-3.1.0/rscode.h
+R100   glabels2/qrencode-3.1.0/split.c qrencode-3.1.0/split.c
+R100   glabels2/qrencode-3.1.0/split.h qrencode-3.1.0/split.h
+R100   glabels2/qrencode-3.1.0/tests/Makefile.am
+qrencode-3.1.0/tests/Makefile.am
+R100   glabels2/qrencode-3.1.0/tests/Makefile.in
+qrencode-3.1.0/tests/Makefile.in
+R100   glabels2/qrencode-3.1.0/tests/common.h
+qrencode-3.1.0/tests/common.h
+R100   glabels2/qrencode-3.1.0/tests/create_frame_pattern.c
+qrencode-3.1.0/tests/create_frame_pattern.c
+R100   glabels2/qrencode-3.1.0/tests/frame     qrencode-3.1.0/tests/frame
+R100   glabels2/qrencode-3.1.0/tests/prof_qrencode.c
+qrencode-3.1.0/tests/prof_qrencode.c
+R100   glabels2/qrencode-3.1.0/tests/test_all.sh
+qrencode-3.1.0/tests/test_all.sh
+R100   glabels2/qrencode-3.1.0/tests/test_bitstream.c
+qrencode-3.1.0/tests/test_bitstream.c
+R100   glabels2/qrencode-3.1.0/tests/test_estimatebit.c
+qrencode-3.1.0/tests/test_estimatebit.c
+R100   glabels2/qrencode-3.1.0/tests/test_monkey.c
+qrencode-3.1.0/tests/test_monkey.c
+R100   glabels2/qrencode-3.1.0/tests/test_qrencode.c
+qrencode-3.1.0/tests/test_qrencode.c
+R100   glabels2/qrencode-3.1.0/tests/test_qrinput.c
+qrencode-3.1.0/tests/test_qrinput.c
+R100   glabels2/qrencode-3.1.0/tests/test_qrspec.c
+qrencode-3.1.0/tests/test_qrspec.c
+R100   glabels2/qrencode-3.1.0/tests/test_rs.c
+qrencode-3.1.0/tests/test_rs.c
+R100   glabels2/qrencode-3.1.0/tests/test_split.c
+qrencode-3.1.0/tests/test_split.c
+R100   glabels2/qrencode-3.1.0/tests/view_qrcode.c
+qrencode-3.1.0/tests/view_qrcode.c
+R100   glabels2/qrencode-3.1.0/use/compile     qrencode-3.1.0/use/compile
+R100   glabels2/qrencode-3.1.0/use/config.guess
+qrencode-3.1.0/use/config.guess
+R100   glabels2/qrencode-3.1.0/use/config.sub
+qrencode-3.1.0/use/config.sub
+R100   glabels2/qrencode-3.1.0/use/depcomp     qrencode-3.1.0/use/depcomp
+R100   glabels2/qrencode-3.1.0/use/install-sh
+qrencode-3.1.0/use/install-sh
+R100   glabels2/qrencode-3.1.0/use/ltmain.sh
+qrencode-3.1.0/use/ltmain.sh
+R100   glabels2/qrencode-3.1.0/use/missing     qrencode-3.1.0/use/missing
 R100   glabels2/src/Makefile.am        src/Makefile.am
-R100   glabels2/src/base64.c   src/base64.c
-R100   glabels2/src/base64.h   src/base64.h
 R100   glabels2/src/bc-gnubarcode.c    src/bc-gnubarcode.c
 R100   glabels2/src/bc-gnubarcode.h    src/bc-gnubarcode.h
 R100   glabels2/src/bc-iec16022.c      src/bc-iec16022.c
 R100   glabels2/src/bc-iec16022.h      src/bc-iec16022.h
+R100   glabels2/src/bc-iec18004.c      src/bc-iec18004.c
+R100   glabels2/src/bc-iec18004.h      src/bc-iec18004.h
 R100   glabels2/src/bc-postnet.c       src/bc-postnet.c
 R100   glabels2/src/bc-postnet.h       src/bc-postnet.h
 R100   glabels2/src/bc.c       src/bc.c
 R100   glabels2/src/bc.h       src/bc.h
+R100   glabels2/src/builder-util.c     src/builder-util.c
+R100   glabels2/src/builder-util.h     src/builder-util.h
 R100   glabels2/src/cairo-ellipse-path.c       src/cairo-ellipse-path.c
 R100   glabels2/src/cairo-ellipse-path.h       src/cairo-ellipse-path.h
 R100   glabels2/src/cairo-label-path.c src/cairo-label-path.c
 R100   glabels2/src/cairo-label-path.h src/cairo-label-path.h
 R100   glabels2/src/cairo-markup-path.c        src/cairo-markup-path.c
 R100   glabels2/src/cairo-markup-path.h        src/cairo-markup-path.h
+R100   glabels2/src/color-combo-button.c       src/color-combo-button.c
+R100   glabels2/src/color-combo-button.h       src/color-combo-button.h
+R100   glabels2/src/color-combo-color-menu-item.c
+src/color-combo-color-menu-item.c
+R100   glabels2/src/color-combo-color-menu-item.h
+src/color-combo-color-menu-item.h
+R100   glabels2/src/color-combo-history.c      src/color-combo-history.c
+R100   glabels2/src/color-combo-history.h      src/color-combo-history.h
+R100   glabels2/src/color-combo-menu.c src/color-combo-menu.c
+R100   glabels2/src/color-combo-menu.h src/color-combo-menu.h
+R100   glabels2/src/color-combo.c      src/color-combo.c
+R100   glabels2/src/color-combo.h      src/color-combo.h
+R100   glabels2/src/color-swatch.c     src/color-swatch.c
+R100   glabels2/src/color-swatch.h     src/color-swatch.h
 R100   glabels2/src/color.c    src/color.c
 R100   glabels2/src/color.h    src/color.h
+R100   glabels2/src/combo-util.c       src/combo-util.c
+R100   glabels2/src/combo-util.h       src/combo-util.h
 R100   glabels2/src/critical-error-handler.c
 src/critical-error-handler.c
 R100   glabels2/src/critical-error-handler.h
 src/critical-error-handler.h
 R100   glabels2/src/debug.c    src/debug.c
 R100   glabels2/src/debug.h    src/debug.h
+R100   glabels2/src/file-util.c        src/file-util.c
+R100   glabels2/src/file-util.h        src/file-util.h
 R100   glabels2/src/file.c     src/file.c
 R100   glabels2/src/file.h     src/file.h
+R100   glabels2/src/font-combo-menu-item.c     src/font-combo-menu-item.c
+R100   glabels2/src/font-combo-menu-item.h     src/font-combo-menu-item.h
+R100   glabels2/src/font-combo-menu.c  src/font-combo-menu.c
+R100   glabels2/src/font-combo-menu.h  src/font-combo-menu.h
+R100   glabels2/src/font-combo.c       src/font-combo.c
+R100   glabels2/src/font-combo.h       src/font-combo.h
+R100   glabels2/src/font-sample.c      src/font-sample.c
+R100   glabels2/src/font-sample.h      src/font-sample.h
+R100   glabels2/src/font-util.c        src/font-util.c
+R100   glabels2/src/font-util.h        src/font-util.h
 R100   glabels2/src/glabels-batch.c    src/glabels-batch.c
 R100   glabels2/src/glabels.c  src/glabels.c
 R100   glabels2/src/hig.h      src/hig.h
@@ -1116,29 +7427,16 @@ R100    glabels2/src/merge-vcard.c      src/merge-vcard.c
 R100   glabels2/src/merge-vcard.h      src/merge-vcard.h
 R100   glabels2/src/merge.c    src/merge.c
 R100   glabels2/src/merge.h    src/merge.h
+R100   glabels2/src/mini-label-preview.c       src/mini-label-preview.c
+R100   glabels2/src/mini-label-preview.h       src/mini-label-preview.h
 R100   glabels2/src/mini-preview-pixbuf-cache.c
 src/mini-preview-pixbuf-cache.c
 R100   glabels2/src/mini-preview-pixbuf-cache.h
 src/mini-preview-pixbuf-cache.h
 R100   glabels2/src/mini-preview-pixbuf.c      src/mini-preview-pixbuf.c
 R100   glabels2/src/mini-preview-pixbuf.h      src/mini-preview-pixbuf.h
-R100   glabels2/src/mygal/Makefile.am  src/mygal/Makefile.am
-R100   glabels2/src/mygal/color-group.c        src/mygal/color-group.c
-R100   glabels2/src/mygal/color-group.h        src/mygal/color-group.h
-R100   glabels2/src/mygal/color-palette.c      src/mygal/color-palette.c
-R100   glabels2/src/mygal/color-palette.h      src/mygal/color-palette.h
-R100   glabels2/src/mygal/e-colors.c   src/mygal/e-colors.c
-R100   glabels2/src/mygal/e-colors.h   src/mygal/e-colors.h
-R100   glabels2/src/mygal/e-marshal.list       src/mygal/e-marshal.list
-R100   glabels2/src/mygal/e-util.h     src/mygal/e-util.h
-R100   glabels2/src/mygal/mygal-combo-box.c
-src/mygal/mygal-combo-box.c
-R100   glabels2/src/mygal/mygal-combo-box.h
-src/mygal/mygal-combo-box.h
-R100   glabels2/src/mygal/widget-color-combo.c
-src/mygal/widget-color-combo.c
-R100   glabels2/src/mygal/widget-color-combo.h
-src/mygal/widget-color-combo.h
+R100   glabels2/src/mini-preview.c     src/mini-preview.c
+R100   glabels2/src/mini-preview.h     src/mini-preview.h
 R100   glabels2/src/new-label-dialog.c src/new-label-dialog.c
 R100   glabels2/src/new-label-dialog.h src/new-label-dialog.h
 R100   glabels2/src/object-editor-bc-page.c
@@ -1170,45 +7468,49 @@ R100    glabels2/src/object-editor.h    src/object-editor.h
 R100   glabels2/src/pixbuf-cache.c     src/pixbuf-cache.c
 R100   glabels2/src/pixbuf-cache.h     src/pixbuf-cache.h
 R100   glabels2/src/pixmaps/Makefile.am        src/pixmaps/Makefile.am
-R100   glabels2/src/pixmaps/checkerboard.xpm
+R100   glabels1/src/pixmaps/checkerboard.xpm
 src/pixmaps/checkerboard.xpm
-R100   glabels2/src/pixmaps/collate.xpm        src/pixmaps/collate.xpm
-R100   glabels2/src/pixmaps/cursor_barcode.xbm
+R100   glabels1/src/pixmaps/collate.xpm        src/pixmaps/collate.xpm
+R100   glabels1/src/pixmaps/cursor_barcode.xbm
 src/pixmaps/cursor_barcode.xbm
-R100   glabels2/src/pixmaps/cursor_barcode_mask.xbm
+R100   glabels1/src/pixmaps/cursor_barcode_mask.xbm
 src/pixmaps/cursor_barcode_mask.xbm
-R100   glabels2/src/pixmaps/cursor_box.xbm     src/pixmaps/cursor_box.xbm
-R100   glabels2/src/pixmaps/cursor_box_mask.xbm
+R100   glabels1/src/pixmaps/cursor_box.xbm     src/pixmaps/cursor_box.xbm
+R100   glabels1/src/pixmaps/cursor_box_mask.xbm
 src/pixmaps/cursor_box_mask.xbm
-R100   glabels2/src/pixmaps/cursor_ellipse.xbm
+R100   glabels1/src/pixmaps/cursor_ellipse.xbm
 src/pixmaps/cursor_ellipse.xbm
-R100   glabels2/src/pixmaps/cursor_ellipse_mask.xbm
+R100   glabels1/src/pixmaps/cursor_ellipse_mask.xbm
 src/pixmaps/cursor_ellipse_mask.xbm
-R100   glabels2/src/pixmaps/cursor_image.xbm
+R100   glabels1/src/pixmaps/cursor_image.xbm
 src/pixmaps/cursor_image.xbm
-R100   glabels2/src/pixmaps/cursor_image_mask.xbm
+R100   glabels1/src/pixmaps/cursor_image_mask.xbm
 src/pixmaps/cursor_image_mask.xbm
-R100   glabels2/src/pixmaps/cursor_line.xbm
+R100   glabels1/src/pixmaps/cursor_line.xbm
 src/pixmaps/cursor_line.xbm
-R100   glabels2/src/pixmaps/cursor_line_mask.xbm
+R100   glabels1/src/pixmaps/cursor_line_mask.xbm
 src/pixmaps/cursor_line_mask.xbm
-R100   glabels2/src/pixmaps/cursor_text.xbm
+R100   glabels1/src/pixmaps/cursor_text.xbm
 src/pixmaps/cursor_text.xbm
-R100   glabels2/src/pixmaps/cursor_text_mask.xbm
+R100   glabels1/src/pixmaps/cursor_text_mask.xbm
 src/pixmaps/cursor_text_mask.xbm
-R100   glabels2/src/pixmaps/nocollate.xpm      src/pixmaps/nocollate.xpm
+R100   glabels1/src/pixmaps/nocollate.xpm      src/pixmaps/nocollate.xpm
 R100   glabels2/src/prefs-dialog.c     src/prefs-dialog.c
 R100   glabels2/src/prefs-dialog.h     src/prefs-dialog.h
 R100   glabels2/src/prefs-model.c      src/prefs-model.c
 R100   glabels2/src/prefs-model.h      src/prefs-model.h
 R100   glabels2/src/prefs.c    src/prefs.c
 R100   glabels2/src/prefs.h    src/prefs.h
+R100   glabels2/src/print-op-dialog.c  src/print-op-dialog.c
+R100   glabels2/src/print-op-dialog.h  src/print-op-dialog.h
 R100   glabels2/src/print-op.c src/print-op.c
 R100   glabels2/src/print-op.h src/print-op.h
 R100   glabels2/src/print.c    src/print.c
 R100   glabels2/src/print.h    src/print.h
 R100   glabels2/src/recent.c   src/recent.c
 R100   glabels2/src/recent.h   src/recent.h
+R100   glabels2/src/rotate-label-button.c      src/rotate-label-button.c
+R100   glabels2/src/rotate-label-button.h      src/rotate-label-button.h
 R100   glabels2/src/stock-pixmaps/Makefile.am
 src/stock-pixmaps/Makefile.am
 R100   glabels2/src/stock-pixmaps/stock_align_bottom_16.png
@@ -1293,6 +7595,8 @@ R100      glabels2/src/stock-pixmaps/stock_vchain_broken_24.png
 src/stock-pixmaps/stock_vchain_broken_24.png
 R100   glabels2/src/stock.c    src/stock.c
 R100   glabels2/src/stock.h    src/stock.h
+R100   glabels2/src/str-util.c src/str-util.c
+R100   glabels2/src/str-util.h src/str-util.h
 R100   glabels2/src/template-designer.c        src/template-designer.c
 R100   glabels2/src/template-designer.h        src/template-designer.h
 R100   glabels2/src/text-node.c        src/text-node.c
@@ -1307,8 +7611,6 @@ R100      glabels2/src/ui-util.c  src/ui-util.c
 R100   glabels2/src/ui-util.h  src/ui-util.h
 R100   glabels2/src/ui.c       src/ui.c
 R100   glabels2/src/ui.h       src/ui.h
-R100   glabels2/src/util.c     src/util.c
-R100   glabels2/src/util.h     src/util.h
 R100   glabels2/src/view-barcode.c     src/view-barcode.c
 R100   glabels2/src/view-barcode.h     src/view-barcode.h
 R100   glabels2/src/view-box.c src/view-box.c
@@ -1331,1461 +7633,17384 @@ R100       glabels2/src/wdgt-chain-button.c        src/wdgt-chain-button.c
 R100   glabels2/src/wdgt-chain-button.h        src/wdgt-chain-button.h
 R100   glabels2/src/wdgt-media-select.c        src/wdgt-media-select.c
 R100   glabels2/src/wdgt-media-select.h        src/wdgt-media-select.h
-R100   glabels2/src/wdgt-mini-preview.c        src/wdgt-mini-preview.c
-R100   glabels2/src/wdgt-mini-preview.h        src/wdgt-mini-preview.h
-R100   glabels2/src/wdgt-print-copies.c        src/wdgt-print-copies.c
-R100   glabels2/src/wdgt-print-copies.h        src/wdgt-print-copies.h
-R100   glabels2/src/wdgt-print-merge.c src/wdgt-print-merge.c
-R100   glabels2/src/wdgt-print-merge.h src/wdgt-print-merge.h
-R100   glabels2/src/wdgt-rotate-label.c        src/wdgt-rotate-label.c
-R100   glabels2/src/wdgt-rotate-label.h        src/wdgt-rotate-label.h
+R100   glabels2/src/wdgt-merge-menu.c  src/wdgt-merge-menu.c
+R100   glabels2/src/wdgt-merge-menu.h  src/wdgt-merge-menu.h
 R100   glabels2/src/window.c   src/window.c
 R100   glabels2/src/window.h   src/window.h
 R100   glabels2/src/xml-label-04.c     src/xml-label-04.c
 R100   glabels2/src/xml-label-04.h     src/xml-label-04.h
 R100   glabels2/src/xml-label.c        src/xml-label.c
 R100   glabels2/src/xml-label.h        src/xml-label.h
+R100   glabels2/templates/Makefile.am  templates/Makefile.am
+R100   glabels2/templates/avery-iso-templates.xml
+templates/avery-iso-templates.xml
+R100   glabels2/templates/avery-other-templates.xml
+templates/avery-other-templates.xml
+R100   glabels2/templates/avery-us-templates.xml
+templates/avery-us-templates.xml
+R100   glabels2/templates/brother-other-templates.xml
+templates/brother-other-templates.xml
+R100   glabels2/templates/categories.xml       templates/categories.xml
+R100   glabels2/templates/dymo-other-templates.xml
+templates/dymo-other-templates.xml
+R100   glabels2/templates/glabels-2.2.dtd      templates/glabels-2.2.dtd
+R100   glabels2/templates/misc-iso-templates.xml
+templates/misc-iso-templates.xml
+R100   glabels2/templates/misc-other-templates.xml
+templates/misc-other-templates.xml
+R100   glabels2/templates/misc-us-templates.xml
+templates/misc-us-templates.xml
+R100   glabels2/templates/paper-sizes.xml      templates/paper-sizes.xml
+R100   glabels2/templates/zweckform-iso-templates.xml
+templates/zweckform-iso-templates.xml
+D      web/common_php.inc
+D      web/contact/index.php
+D      web/css/glabels.css
+D      web/doc/glabels-2.0.dtd.txt
+D      web/doc/glabels-2.2.dtd.txt
+D      web/doc/index.php
+D      web/doc/install-src/index.php
+D      web/doc/templates-2.0/glabels-template-cd.png
+D      web/doc/templates-2.0/glabels-template-label.png
+D      web/doc/templates-2.0/glabels-template-layout.png
+D      web/doc/templates-2.0/index.php
+D      web/doc/templates-2.2/glabels-template-cd.png
+D      web/doc/templates-2.2/glabels-template-label.png
+D      web/doc/templates-2.2/glabels-template-layout.png
+D      web/doc/templates-2.2/index.php
+D      web/download/index.php
+D      web/faq/index.php
+D      web/faq/q1.3-output.png
+D      web/faq/q1.3-screenshot.png
+D      web/images/button-bg.png
+D      web/images/corner-bl.png
+D      web/images/corner-br.png
+D      web/images/corner-tl.png
+D      web/images/corner-tr.png
+D      web/images/glabels-title-140.png
+D      web/images/pixel-null.png
+D      web/index.php
+D      web/links/index.php
+D      web/news/index.php
+D      web/screenshots/191-screenshot-main-grid-thumb.png
+D      web/screenshots/191-screenshot-main-grid.png
+D      web/screenshots/191-screenshot-main-thumb.png
+D      web/screenshots/191-screenshot-main.png
+D      web/screenshots/191-screenshot-new-thumb.png
+D      web/screenshots/191-screenshot-new.png
+D      web/screenshots/191-screenshot-print-merge-thumb.png
+D      web/screenshots/191-screenshot-print-merge.png
+D      web/screenshots/191-screenshot-print-simple-thumb.png
+D      web/screenshots/191-screenshot-print-simple.png
+D      web/screenshots/192-screenshot-thumb.png
+D      web/screenshots/192-screenshot.png
+D      web/screenshots/193-screenshot-main-thumb.png
+D      web/screenshots/193-screenshot-main.png
+D      web/screenshots/193-screenshot-new-thumb.png
+D      web/screenshots/193-screenshot-new.png
+D      web/screenshots/193-screenshot-preview-thumb.png
+D      web/screenshots/193-screenshot-preview.png
+D      web/screenshots/193-screenshot-print-thumb.png
+D      web/screenshots/193-screenshot-print.png
+D      web/screenshots/220-screenshot-main-thumb.png
+D      web/screenshots/220-screenshot-main.png
+D      web/screenshots/220-screenshot-new-thumb.png
+D      web/screenshots/220-screenshot-new.png
+D      web/screenshots/220-screenshot-preview-thumb.png
+D      web/screenshots/220-screenshot-preview.png
+D      web/screenshots/220-screenshot-print-thumb.png
+D      web/screenshots/220-screenshot-print.png
+D      web/screenshots/glabels1-screenshot-thumb.jpg
+D      web/screenshots/glabels1-screenshot.jpg
+D      web/screenshots/glabels1-screenshot.png
+D      web/screenshots/index.php
+D      web/source/glabels-0.1.0.tar.gz
+D      web/source/glabels-0.1.1.tar.gz
+D      web/source/glabels-0.1.2.tar.gz
+D      web/source/glabels-0.1.3.tar.gz
+D      web/source/glabels-0.1.4.tar.gz
+D      web/source/glabels-0.1.5.tar.gz
+D      web/source/glabels-0.2.0.tar.gz
+D      web/source/glabels-0.2.1.tar.gz
+D      web/source/glabels-0.2.2.tar.gz
+D      web/source/glabels-0.2.3.tar.gz
+D      web/source/glabels-0.2.4.tar.gz
+D      web/source/glabels-0.3.0.tar.gz
+D      web/source/glabels-0.3.1.tar.gz
+D      web/source/glabels-0.3.2.tar.gz
+D      web/source/glabels-0.3.3.tar.gz
+D      web/source/glabels-0.3.4.tar.gz
+D      web/source/glabels-0.4.0.tar.gz
+D      web/source/glabels-0.4.1.tar.gz
+D      web/source/glabels-0.4.2.tar.gz
+D      web/source/glabels-0.4.3.tar.gz
+D      web/source/glabels-0.4.4.tar.gz
+D      web/source/glabels-0.4.5.tar.gz
+D      web/source/glabels-0.4.6.tar.gz
+D      web/source/glabels-1.89.0.tar.gz
+D      web/source/glabels-1.89.1.tar.gz
+D      web/source/glabels-1.89.2.tar.gz
+D      web/source/glabels-1.90.0.tar.gz
+D      web/source/glabels-1.91.0.tar.gz
+D      web/source/glabels-1.91.1.tar.gz
+D      web/source/glabels-1.92.0.tar.gz
+D      web/source/glabels-1.92.1.tar.gz
+D      web/source/glabels-1.92.2.tar.gz
+D      web/source/glabels-1.92.3.tar.gz
+D      web/source/glabels-1.93.0.tar.gz
+D      web/source/glabels-1.93.1.tar.gz
+D      web/source/glabels-1.93.2.tar.gz
+D      web/source/glabels-1.93.3.tar.gz
+D      web/tango-icons/applications-development.png
+D      web/tango-icons/applications-internet.png
+D      web/tango-icons/dialog-information.png
+D      web/tango-icons/emblem-photos.png
+D      web/tango-icons/help-browser.png
+D      web/tango-icons/internet-news-reader.png
+D      web/tango-icons/package-x-generic.png
+D      web/tango-icons/system-users.png
+
+commit afa4a2a62381d2502254a8928216f11509aa1b7d
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-23
+
+    2009-09-22 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+       * src/Makefile.am:
+       * src/builder-util.c:
+       * src/builder-util.h:
+       * src/combo-util.c:
+       * src/combo-util.h:
+       * src/file-util.c:
+       * src/file-util.h:
+       * src/str-util.c:
+       * src/str-util.h:
+               Split "catch all" util module into separate modules
+               for different
+               domains of utilities.
+       * src/file.c: (gl_file_open_real), (save_as_response):
+       * src/glabels-batch.c: (main):
+       * src/label.c: (gl_label_get_short_name):
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_init),
+       (gl_merge_properties_dialog_construct):
+       * src/new-label-dialog.c:
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page),
+       (gl_object_editor_set_bc_style), (gl_object_editor_set_bc_color):
+       * src/object-editor-data-page.c:
+       (gl_object_editor_prepare_data_page), (gl_object_editor_set_data):
+       * src/object-editor-edit-page.c:
+       (gl_object_editor_prepare_edit_page):
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_prepare_fill_page),
+       (gl_object_editor_set_fill_color):
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page),
+       (gl_object_editor_set_image):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page),
+       (gl_object_editor_set_line_color):
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_prepare_lsize_page):
+       * src/object-editor-position-page.c:
+       (gl_object_editor_prepare_position_page):
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_prepare_shadow_page),
+       (gl_object_editor_set_shadow_color):
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_text_color):
+       * src/object-editor.c: (gl_object_editor_init),
+       (gl_object_editor_set_key_names):
+       * src/prefs-dialog.c: (gl_prefs_dialog_construct),
+       (construct_locale_page), (construct_object_page):
+       * src/prefs-model.c: (gl_prefs_model_save_settings),
+       (gl_prefs_model_load_settings):
+       * src/print-op-dialog.c: (create_custom_widget_cb):
+       * src/template-designer.c: (construct_start_page),
+       (construct_name_page), (construct_pg_size_page),
+       (construct_shape_page), (construct_rect_size_page),
+       (construct_round_size_page), (construct_cd_size_page),
+       (construct_nlayouts_page), (construct_layout_page),
+       (construct_finish_page):
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct):
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
+       (gl_wdgt_media_select_set_filter_parameters),
+       (get_label_size_desc):
+       * src/window.c: (gl_window_new_from_file):
+       * src/xml-label-04.c: (xml04_parse_text_props):
+       * src/xml-label.c: (xml_parse_object_text),
+       (xml_parse_toplevel_span), (xml_create_object_text),
+       (xml_create_toplevel_span):
+               Reconciled all references to old utils module with
+               new domain
+               specific utilities modules.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@895
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/builder-util.c
+A      glabels2/src/builder-util.h
+A      glabels2/src/combo-util.c
+A      glabels2/src/combo-util.h
+A      glabels2/src/file-util.c
+A      glabels2/src/file-util.h
+M      glabels2/src/file.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/label.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/print-op-dialog.c
+A      glabels2/src/str-util.c
+A      glabels2/src/str-util.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+D      glabels2/src/util.c
+D      glabels2/src/util.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/window.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+
+commit b837823b737bdc2dd87ccc7d16e48d8079ed04e4
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-23
+
+    2009-09-22 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+               Include all (src/*.[ch]) source files.
+       * data/builder/merge-properties-dialog.builder:
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_init),
+       (gl_merge_properties_dialog_construct), (type_changed_cb):
+               - OK button now has default focus.
+               - Some formatting cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@894
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/merge-properties-dialog.builder
+M      glabels2/po/POTFILES.in
+M      glabels2/src/merge-properties-dialog.c
+
+commit c41ee6a35575304bc9a08337f75b7e2a1c658e7e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-21
+
+    2009-09-21 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+       * data/builder/Makefile.am:
+       * data/builder/new-label-dialog.builder:
+               Removed trivial builder file for new label dialog.
+       * data/builder/wdgt-media-select.builder:
+               Changed focus behavior of widgets.
+       * src/new-label-dialog.c: (gl_new_label_dialog_init),
+       (gl_new_label_dialog_construct):
+               - Removed use of trivial builder file -- populate
+               explicitely.
+               - Moved population code to init.
+               - OK button now has default focus.
+               - Some formatting cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@893
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/Makefile.am
+D      glabels2/data/builder/new-label-dialog.builder
+M      glabels2/data/builder/wdgt-media-select.builder
+M      glabels2/po/POTFILES.in
+M      glabels2/src/new-label-dialog.c
+
+commit bbbf408cc04af2b04aea5c0607e780cb1f6a70f0
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-20
+
+    *po/de.po: Updated German translation
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@892
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/de.po
+
+commit 8faa3c122a93e40e4d296af10155542818b4666e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-19
+
+    2009-09-19 Jim Evins  <evins@snaught.com>
+
+       * COPYING:
+               Updated to GPL3 text.
+       * COPYING-LIBGLABELS:
+               Updated to LGPL3 text.
+       * COPYING-TEMPLATES:
+               New MIT/X license file for templates subdirectory.
+       * COPYING.README_FIRST:
+               Updated licensing information.
+       * templates/Makefile.am:
+       * templates/avery-iso-templates.xml:
+       * templates/avery-other-templates.xml:
+       * templates/avery-us-templates.xml:
+       * templates/brother-other-templates.xml:
+       * templates/categories.xml:
+       * templates/dymo-other-templates.xml:
+       * templates/glabels-2.2.dtd:
+       * templates/misc-iso-templates.xml:
+       * templates/misc-other-templates.xml:
+       * templates/misc-us-templates.xml:
+       * templates/paper-sizes.xml:
+       * templates/zweckform-iso-templates.xml:
+               - Added MIT/X license notice to database files.
+               - Moved from data subdirectory.
+       * configure.in:
+       * po/POTFILES.in:
+       * Makefile.am:
+       * data/Makefile.am:
+               Updated to reflect above move.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@891
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/COPYING
+M      glabels2/COPYING-LIBGLABELS
+A      glabels2/COPYING-TEMPLATES
+M      glabels2/COPYING.README_FIRST
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+M      glabels2/data/Makefile.am
+D      glabels2/data/dtd/Makefile.am
+D      glabels2/data/templates/avery-other-templates.xml
+D      glabels2/data/templates/categories.xml
+D      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/po/POTFILES.in
+R079   glabels2/data/templates/Makefile.am
+glabels2/templates/Makefile.am
+R092   glabels2/data/templates/avery-iso-templates.xml
+glabels2/templates/avery-iso-templates.xml
+A      glabels2/templates/avery-other-templates.xml
+R096   glabels2/data/templates/avery-us-templates.xml
+glabels2/templates/avery-us-templates.xml
+R064   glabels2/data/templates/brother-other-templates.xml
+glabels2/templates/brother-other-templates.xml
+A      glabels2/templates/categories.xml
+R078   glabels2/data/templates/dymo-other-templates.xml
+glabels2/templates/dymo-other-templates.xml
+R093   glabels2/data/dtd/glabels-2.2.dtd
+glabels2/templates/glabels-2.2.dtd
+R096   glabels2/data/templates/misc-iso-templates.xml
+glabels2/templates/misc-iso-templates.xml
+A      glabels2/templates/misc-other-templates.xml
+R090   glabels2/data/templates/misc-us-templates.xml
+glabels2/templates/misc-us-templates.xml
+R071   glabels2/data/templates/paper-sizes.xml
+glabels2/templates/paper-sizes.xml
+R090   glabels2/data/templates/zweckform-iso-templates.xml
+glabels2/templates/zweckform-iso-templates.xml
+
+commit cc737549c143021a3463c490c6122261717b918c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-19
+
+    2009-09-19 Jim Evins  <evins@snaught.com>
+
+       * libglabels/category.c:
+       * libglabels/category.h:
+       * libglabels/db.c:
+       * libglabels/db.h:
+       * libglabels/enums.h:
+       * libglabels/libglabels-private.h:
+       * libglabels/libglabels.h:
+       * libglabels/paper.c:
+       * libglabels/paper.h:
+       * libglabels/str.c:
+       * libglabels/str.h:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-category.c:
+       * libglabels/xml-category.h:
+       * libglabels/xml-paper.c:
+       * libglabels/xml-paper.h:
+       * libglabels/xml-template.c:
+       * libglabels/xml-template.h:
+       * libglabels/xml.c:
+       * libglabels/xml.h:
+               - Cleaned up GTK/GLIB includes.
+               - Updated license notification to LGPL3+.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@890
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/category.c
+M      glabels2/libglabels/category.h
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/db.h
+M      glabels2/libglabels/enums.h
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/libglabels.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/str.c
+M      glabels2/libglabels/str.h
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-category.c
+M      glabels2/libglabels/xml-category.h
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-paper.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml-template.h
+M      glabels2/libglabels/xml.c
+M      glabels2/libglabels/xml.h
+
+commit 728c32fbe052cd712c75a0e6abd857b9edad0769
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-19
+
+    2009-09-18 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+               Added missing file.
+       * src/mini-preview.h:
+       * src/mini-preview.c: (gl_mini_preview_class_init),
+       (gl_mini_preview_finalize), (gl_mini_preview_set_by_name),
+       (gl_mini_preview_highlight_range), (gl_mini_preview_set_label),
+       (gl_mini_preview_set_page), (gl_mini_preview_set_n_sheets),
+       (gl_mini_preview_set_n_copies), (gl_mini_preview_set_first),
+       (gl_mini_preview_set_last), (gl_mini_preview_set_collate_flag),
+       (gl_mini_preview_set_outline_flag),
+       (gl_mini_preview_set_reverse_flag),
+       (gl_mini_preview_set_crop_marks_flag), (button_release_event_cb),
+       (expose_event_cb), (redraw), (draw), (draw_labels),
+       (draw_rich_preview):
+               Added rich preview capability to mini preview.
+       * src/print-op-dialog.c: (create_custom_widget_cb),
+       (simple_sheets_radio_cb), (simple_first_spin_cb),
+       (simple_last_spin_cb), (preview_pressed_cb),
+       (preview_released_cb),
+       (merge_spin_cb), (merge_collate_check_cb), (preview_clicked_cb),
+       (option_toggled_cb):
+               Use new rich preview capability of mini preview in
+               print dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@889
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/src/mini-preview.c
+M      glabels2/src/mini-preview.h
+M      glabels2/src/print-op-dialog.c
+
+commit 8ab36a60a289ee05a68bff6e0057fcfedbc707f6
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-18
+
+    po/POTFILES.in: Removed name of no longer existant file
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@888
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 25a36cf2b7d91c7578d40b141b6810e5f635b629
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-18
+
+    2009-09-17 Jim Evins  <evins@snaught.com>
+
+       * src/stock.c: (add_icons), (add_button_icon):
+               Use proper free function for GtkIconSource
+               (gtk_icon_source_free() not g_free()).
+               Patch provided by Christian Persch <chpe@gnome.org>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@886
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/stock.c
+
+commit 7e55e35f41dbbbbb2dcf285fa5fbcc9007628457
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-18
+
+    2009-09-17 Jim Evins  <evins@snaught.com>
+
+       * libglabels/category.h:
+       * libglabels/db.h:
+       * libglabels/paper.h:
+       * libglabels/template.h:
+       * libglabels/xml-category.h:
+       * libglabels/xml-paper.h:
+       * libglabels/xml.h:
+               Cleaned up GTK/GLIB includes.
+       * src/bc-gnubarcode.c:
+       * src/bc-gnubarcode.h:
+       * src/bc-iec16022.c:
+       * src/bc-iec16022.h:
+       * src/bc-iec18004.c:
+       * src/bc-iec18004.h:
+       * src/bc-postnet.c:
+       * src/bc-postnet.h:
+       * src/bc.c:
+       * src/bc.h:
+       * src/cairo-ellipse-path.c:
+       * src/cairo-ellipse-path.h:
+       * src/cairo-label-path.c:
+       * src/cairo-label-path.h:
+       * src/cairo-markup-path.c:
+       * src/cairo-markup-path.h:
+       * src/color-combo-button.c:
+       * src/color-combo-button.h:
+       * src/color-combo-color-menu-item.c:
+       * src/color-combo-color-menu-item.h:
+       * src/color-combo-history.c:
+       * src/color-combo-menu.c:
+       * src/color-combo-menu.h:
+       * src/color-combo.c:
+       * src/color-combo.h:
+       * src/color-swatch.c:
+       * src/color-swatch.h:
+       * src/color.c:
+       * src/color.h:
+       * src/critical-error-handler.c:
+       * src/critical-error-handler.h:
+       * src/debug.c:
+       * src/debug.h:
+       * src/file.c:
+       * src/file.h:
+       * src/font-combo-menu-item.c:
+       * src/font-combo-menu-item.h:
+       * src/font-combo-menu.c:
+       * src/font-combo-menu.h:
+       * src/font-combo.c:
+       * src/font-combo.h:
+       * src/font-sample.h:
+       * src/font-util.c:
+       * src/font-util.h:
+       * src/glabels-batch.c:
+       * src/glabels.c:
+       * src/hig.h:
+       * src/label-barcode.c:
+       * src/label-barcode.h:
+       * src/label-box.c:
+       * src/label-box.h:
+       * src/label-ellipse.c:
+       * src/label-ellipse.h:
+       * src/label-image.c:
+       * src/label-image.h:
+       * src/label-line.c:
+       * src/label-line.h:
+       * src/label-object.c:
+       * src/label-object.h:
+       * src/label-text.c:
+       * src/label-text.h:
+       * src/label.c:
+       * src/label.h:
+       * src/merge-evolution.c:
+       * src/merge-evolution.h:
+       * src/merge-init.c:
+       * src/merge-init.h:
+       * src/merge-properties-dialog.c:
+       * src/merge-properties-dialog.h:
+       * src/merge-text.c:
+       * src/merge-text.h:
+       * src/merge-vcard.c:
+       * src/merge-vcard.h:
+       * src/merge.c:
+       * src/merge.h:
+       * src/mini-label-preview.c:
+       * src/mini-label-preview.h:
+       * src/mini-preview-pixbuf-cache.c:
+       * src/mini-preview-pixbuf-cache.h:
+       * src/mini-preview-pixbuf.c:
+       * src/mini-preview-pixbuf.h:
+       * src/mini-preview.c:
+       * src/new-label-dialog.c:
+       * src/new-label-dialog.h:
+       * src/object-editor-bc-page.c:
+       * src/object-editor-data-page.c:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-image-page.c:
+       * src/object-editor-line-page.c:
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-private.h:
+       * src/object-editor-shadow-page.c:
+       * src/object-editor-size-page.c:
+       * src/object-editor-text-page.c:
+       * src/object-editor.c:
+       * src/object-editor.h:
+       * src/pixbuf-cache.c:
+       * src/pixbuf-cache.h:
+       * src/prefs-dialog.c:
+       * src/prefs-dialog.h:
+       * src/prefs-model.c:
+       * src/prefs-model.h:
+       * src/prefs.c:
+       * src/prefs.h:
+       * src/print-op-dialog.c:
+       * src/print-op.c:
+       * src/print-op.h:
+       * src/print.c:
+       * src/print.h:
+       * src/recent.c:
+       * src/recent.h:
+       * src/rotate-label-button.c:
+       * src/rotate-label-button.h:
+       * src/stock.c:
+       * src/stock.h:
+       * src/template-designer.c:
+       * src/template-designer.h:
+       * src/text-node.c:
+       * src/text-node.h:
+       * src/ui-commands.c:
+       * src/ui-commands.h:
+       * src/ui-property-bar.c:
+       * src/ui-property-bar.h:
+       * src/ui-sidebar.c:
+       * src/ui-sidebar.h:
+       * src/ui-util.c:
+       * src/ui-util.h:
+       * src/ui.c:
+       * src/ui.h:
+       * src/util.c:
+       * src/util.h:
+       * src/view-barcode.c:
+       * src/view-barcode.h:
+       * src/view-box.c:
+       * src/view-box.h:
+       * src/view-ellipse.c:
+       * src/view-ellipse.h:
+       * src/view-image.c:
+       * src/view-image.h:
+       * src/view-line.c:
+       * src/view-line.h:
+       * src/view-object.c:
+       * src/view-object.h:
+       * src/view-text.c:
+       * src/view-text.h:
+       * src/view.c:
+       * src/view.h:
+       * src/warning-handler.c:
+       * src/warning-handler.h:
+       * src/wdgt-chain-button.c:
+       * src/wdgt-chain-button.h:
+       * src/wdgt-media-select.c:
+       * src/wdgt-media-select.h:
+       * src/wdgt-merge-menu.c:
+       * src/wdgt-merge-menu.h:
+       * src/window.c:
+       * src/window.h:
+       * src/xml-label-04.c:
+       * src/xml-label-04.h:
+       * src/xml-label.c:
+       * src/xml-label.h:
+               Cleaned up GTK/GLIB includes.
+               Updated remainder of notices to GPL3+.
+               Simple formatting cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@885
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/category.h
+M      glabels2/libglabels/db.h
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-category.h
+M      glabels2/libglabels/xml-paper.h
+M      glabels2/libglabels/xml.h
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-gnubarcode.h
+M      glabels2/src/bc-iec16022.c
+M      glabels2/src/bc-iec16022.h
+M      glabels2/src/bc-iec18004.c
+M      glabels2/src/bc-iec18004.h
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc-postnet.h
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/cairo-ellipse-path.c
+M      glabels2/src/cairo-ellipse-path.h
+M      glabels2/src/cairo-label-path.c
+M      glabels2/src/cairo-label-path.h
+M      glabels2/src/cairo-markup-path.c
+M      glabels2/src/cairo-markup-path.h
+M      glabels2/src/color-combo-button.c
+M      glabels2/src/color-combo-button.h
+M      glabels2/src/color-combo-color-menu-item.c
+M      glabels2/src/color-combo-color-menu-item.h
+M      glabels2/src/color-combo-history.c
+M      glabels2/src/color-combo-menu.c
+M      glabels2/src/color-combo-menu.h
+M      glabels2/src/color-combo.c
+M      glabels2/src/color-combo.h
+M      glabels2/src/color-swatch.c
+M      glabels2/src/color-swatch.h
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/critical-error-handler.c
+M      glabels2/src/critical-error-handler.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/font-combo-menu-item.c
+M      glabels2/src/font-combo-menu-item.h
+M      glabels2/src/font-combo-menu.c
+M      glabels2/src/font-combo-menu.h
+M      glabels2/src/font-combo.c
+M      glabels2/src/font-combo.h
+M      glabels2/src/font-sample.h
+M      glabels2/src/font-util.c
+M      glabels2/src/font-util.h
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/hig.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/merge-evolution.h
+M      glabels2/src/merge-init.c
+M      glabels2/src/merge-init.h
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge-text.h
+M      glabels2/src/merge-vcard.c
+M      glabels2/src/merge-vcard.h
+M      glabels2/src/merge.c
+M      glabels2/src/merge.h
+M      glabels2/src/mini-label-preview.c
+M      glabels2/src/mini-label-preview.h
+M      glabels2/src/mini-preview-pixbuf-cache.c
+M      glabels2/src/mini-preview-pixbuf-cache.h
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/mini-preview-pixbuf.h
+M      glabels2/src/mini-preview.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/new-label-dialog.h
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/pixbuf-cache.c
+M      glabels2/src/pixbuf-cache.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/print-op-dialog.c
+M      glabels2/src/print-op.c
+M      glabels2/src/print-op.h
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/recent.c
+M      glabels2/src/recent.h
+M      glabels2/src/rotate-label-button.c
+M      glabels2/src/rotate-label-button.h
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.h
+M      glabels2/src/text-node.c
+M      glabels2/src/text-node.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-commands.h
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-sidebar.h
+M      glabels2/src/ui-util.c
+M      glabels2/src/ui-util.h
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-barcode.h
+M      glabels2/src/view-box.c
+M      glabels2/src/view-box.h
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-ellipse.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-image.h
+M      glabels2/src/view-line.c
+M      glabels2/src/view-line.h
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view-text.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/warning-handler.c
+M      glabels2/src/warning-handler.h
+M      glabels2/src/wdgt-chain-button.c
+M      glabels2/src/wdgt-chain-button.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-merge-menu.c
+M      glabels2/src/wdgt-merge-menu.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-04.h
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-label.h
+
+commit 83898579197af3dbe8fecb57c729770cd7e34694
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-16
+
+    de.po: Updated German translation
+    POTFILES.in: Removed filenames which are no longer available
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@884
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/po/de.po
+
+commit a1f61988eb85f9133482e6f8fa6232600f897b1c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-13
+
+    2009-09-13 Jim Evins  <evins@snaught.com>
+
+       Refactored print operation subsystem.
+
+       * src/print-op.c:
+       * src/print-op.h:
+               Basic GtkPrintOperation based class.  Does not instantiate
+               custom widgets, so it can be used by glabels-batch without
+               the additional overhead.
+       * src/print-op-dialog.c:
+       * src/print-op-dialog.h:
+               New object derived from glPrintOp.  This one is intended
+               to be used as a dialog and installs custom widgets.
+               glWdgtPrintCopies and glWdgtPrintMerge have been merged
+               into this object.
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-print-merge.h:
+               Deleted.
+       * src/Makefile.am:
+               Modified to reflect above additions and deletions.
+       * src/mini-preview.c: (gl_mini_preview_construct),
+       (gl_mini_preview_set_template), (set_transform_and_get_scale),
+       (button_press_event_cb), (motion_notify_event_cb), (draw):
+               Now scales with allocation.
+       * src/glabels-batch.c: (main):
+       * src/template-designer.c: (print_test_cb):
+       * src/ui-commands.c: (gl_ui_cmd_file_print):
+               Use above modifications.
+       * data/builder/print-op-dialog-custom-widget.builder:
+               New builder file for glPrintOpDialog custom widgets.
+       * data/builder/print-custom-widget.builder:
+               Deleted.
+       * data/builder/Makefile.am:
+               Modified to reflect above addition and deletion.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@883
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/Makefile.am
+D      glabels2/data/builder/print-custom-widget.builder
+A      glabels2/data/builder/print-op-dialog-custom-widget.builder
+M      glabels2/src/Makefile.am
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/mini-preview.c
+A      glabels2/src/print-op-dialog.c
+A      glabels2/src/print-op-dialog.h
+M      glabels2/src/print-op.c
+M      glabels2/src/print-op.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-commands.c
+D      glabels2/src/wdgt-print-copies.c
+D      glabels2/src/wdgt-print-copies.h
+D      glabels2/src/wdgt-print-merge.c
+D      glabels2/src/wdgt-print-merge.h
+
+commit 96a9288a2f2f9b72daf98f7a768d0e37345dcc9e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-11
+
+    2009-09-10 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/mini-label-preview.c:
+       * src/mini-label-preview.h:
+               Created new glMiniLabelPreview widget to support
+               glRotateLabelButton.
+       * src/rotate-label-button.c:
+       * src/rotate-label-button.h:
+               Renamed glWdgtRotateLabel to glRotateLabelButton.
+       * src/new-label-dialog.c: (gl_new_label_dialog_construct),
+       (template_changed_cb), (gl_new_label_dialog_get_rotate_state),
+       (gl_new_label_dialog_set_rotate_state):
+               Propogated above renaming.
+       * src/mini-preview.c: (gl_mini_preview_set_template), (draw),
+       (draw_shadow), (draw_paper), (draw_labels):
+               Use GtkStyle for colors instead of hardcoded ones.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@882
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+A      glabels2/src/mini-label-preview.c
+A      glabels2/src/mini-label-preview.h
+M      glabels2/src/mini-preview.c
+M      glabels2/src/new-label-dialog.c
+A      glabels2/src/rotate-label-button.c
+A      glabels2/src/rotate-label-button.h
+D      glabels2/src/wdgt-rotate-label.c
+D      glabels2/src/wdgt-rotate-label.h
+
+commit cedd2451f2f2a5d8d3ca52c74659ce6597dce235
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-10
+
+    2009-09-09 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * Makefile.am:
+       * src/Makefile.am:
+       * src/stock-pixmaps/Makefile.am:
+       * qrencode-3.1.0/Makefile.am
+       * data/desktop/glabels.desktop.in:
+       * docs/libglabels/libglabels-decl-list.txt:
+               Various build system fixes and cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@880
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/barcode-0.98/Makefile.am
+M      glabels2/configure.in
+M      glabels2/data/desktop/glabels.desktop.in
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+D      glabels2/help/C/Makefile.am
+M      glabels2/help/Makefile.am
+M      glabels2/qrencode-3.1.0/Makefile.am
+M      glabels2/src/Makefile.am
+M      glabels2/src/stock-pixmaps/Makefile.am
+
+commit 245cb815f5a040b97443fff0229afd0d74711a5c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-09
+
+    2009-09-08 Jim Evins  <evins@snaught.com>
+
+       * src/font-util.c: (gl_font_util_validate_family):
+       * src/font-util.h:
+               Added gl_font_util_validate_family().
+       * src/font-combo.c: (gl_font_combo_class_init),
+       (gl_font_combo_new), (gl_font_combo_set_family):
+               Use gl_font_util_validate_family() when setting family.
+       * src/label-text.c: (set_font_family):
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs):
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_font_family):
+               Removed code obsoleted by the addition of
+               gl_font_util_validate_family().
+       * src/color-swatch.c: (gl_color_swatch_class_init),
+       (style_set_cb),
+       (draw_swatch):
+       * src/font-sample.c: (gl_font_sample_class_init), (style_set_cb),
+       (draw_sample):
+               Added handler for style_set event.
+       * src/color-combo-button.c: (gl_color_combo_button_class_init):
+       * src/color-combo-color-menu-item.c:
+       (gl_color_combo_color_menu_item_class_init):
+       * src/color-combo-history.c: (gl_color_combo_history_class_init):
+       * src/color-combo-menu.c: (map_event_cb):
+       * src/color-combo.c: (gl_color_combo_class_init),
+       (gl_color_combo_new):
+       * src/font-combo-menu-item.c:
+       (gl_font_combo_menu_item_class_init):
+       * src/font-combo-menu.c: (gl_font_combo_menu_class_init):
+       * src/wdgt-rotate-label.c: (create_pixbuf):
+               Various cleanups -- mostly removing unused variables.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@877
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/color-combo-button.c
+M      glabels2/src/color-combo-color-menu-item.c
+M      glabels2/src/color-combo-history.c
+M      glabels2/src/color-combo-menu.c
+M      glabels2/src/color-combo.c
+M      glabels2/src/color-swatch.c
+M      glabels2/src/font-combo-menu-item.c
+M      glabels2/src/font-combo-menu.c
+M      glabels2/src/font-combo.c
+M      glabels2/src/font-sample.c
+M      glabels2/src/font-util.c
+M      glabels2/src/font-util.h
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit fabfeed962240d2d0a128576218b690564470b50
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2009-09-08
+
+    Updated German doc translation, added screenshots
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@876
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/help/de/de.po
+A      glabels2/help/de/figures/main-window-empty.png
+A      glabels2/help/de/figures/merge-ex1-1.png
+A      glabels2/help/de/figures/merge-ex1-2.png
+A      glabels2/help/de/figures/merge-ex1-3.png
+A      glabels2/help/de/figures/merge-ex1-4.png
+A      glabels2/help/de/figures/merge-ex2-1.png
+A      glabels2/help/de/figures/merge-ex2-2.png
+A      glabels2/help/de/figures/merge-ex2-3.png
+A      glabels2/help/de/figures/merge-ex2-4.png
+A      glabels2/help/de/figures/object-editor-sidebar.png
+A      glabels2/help/de/figures/print-copies.png
+A      glabels2/help/de/figures/print-merge.png
+
+commit c5a7ae0d233eb95f7ef7424f38d99ffb6a8cc555
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-08
+
+    2009-09-07 Jim Evins  <evins@snaught.com>
+
+       Created new glFontCombo widget family subsystem + minor
+       refinements to glColorCombo
+       widget family.
+
+       * src/color-combo-button.c:
+       * src/color-combo-button.h:
+               Renamed ColorButton to ColorComboButton.
+       * src/color.h:
+               Added GL_COLOR_WHITE macro.
+       * src/color-combo.c: (gl_color_combo_init):
+               Minor cleanup.
+       * src/Makefile.am:
+       * src/font-combo.c:
+       * src/font-combo.h:
+       * src/font-combo-menu.c:
+       * src/font-combo-menu.h:
+       * src/font-combo-menu-item.c:
+       * src/font-combo-menu-item.h:
+       * src/font-sample.c:
+       * src/font-sample.h:
+       * src/font-util.c:
+       * src/font-util.h:
+               New FontCombo subsystem.
+       * src/util.c:
+       * src/util.h:
+               Moved font functions to font-util.[ch].
+       * data/builder/object-editor.builder:
+       * data/builder/prefs-dialog.builder:
+       * data/builder/property-bar.builder:
+       * src/label-text.c: (set_font_family):
+       * src/object-editor-private.h:
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_font_family),
+       (gl_object_editor_get_font_family):
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs), (update_prefs_from_object_page):
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties), (update_text_properties),
+       (update_fill_color), (update_line_color),
+       (font_family_changed_cb),
+       (text_color_changed_cb), (fill_color_changed_cb),
+       (line_color_changed_cb):
+               Incorporated new FontCombo subsystem.
+       * po/POTFILES.in:
+               Reconciled with above changes/additions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@872
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/object-editor.builder
+M      glabels2/data/builder/prefs-dialog.builder
+M      glabels2/data/builder/property-bar.builder
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+D      glabels2/src/color-button.h
+R078   glabels2/src/color-button.c     glabels2/src/color-combo-button.c
+A      glabels2/src/color-combo-button.h
+M      glabels2/src/color-combo.c
+M      glabels2/src/color.h
+A      glabels2/src/font-combo-menu-item.c
+A      glabels2/src/font-combo-menu-item.h
+A      glabels2/src/font-combo-menu.c
+A      glabels2/src/font-combo-menu.h
+C059   glabels2/src/color-combo.c      glabels2/src/font-combo.c
+A      glabels2/src/font-combo.h
+A      glabels2/src/font-sample.c
+A      glabels2/src/font-sample.h
+A      glabels2/src/font-util.c
+A      glabels2/src/font-util.h
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+
+commit 40b43703976586165fbf035c0419b5c6e687efc2
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-06
+
+    2009-09-06 Jim Evins  <evins@snaught.com>
+
+       * src/color-button.c: (gl_color_button_finalize):
+               Unreference menu in finalize.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@871
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/color-button.c
+
+commit 036015bb9ed3b53bf85f25ed3b17a4886bdeedbc
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-06
+
+    Added link to glabels-commit mail list.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@870
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/contact/index.php
+
+commit 2e3f514405a35f35f7e29c839e2360ab924894a7
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-06
+
+    2009-09-06 Jim Evins  <evins@snaught.com>
+
+       Some major refinements to the glColorCombo family of widgets.
+
+       * src/Makefile.am:
+       * src/color-button.c:
+       * src/color-button.h:
+               New widget: glColorButton.  This widget is a button
+               that applies
+               the currently selected color with a ColorCombo type
+               dropdown button
+               to change that selected color.  This is basically the old
+               glColorCombo widget.
+       * src/color-combo.c: (gl_color_combo_init),
+       (gl_color_combo_finalize), (gl_color_combo_new),
+       (button_press_event_cb), (menu_color_changed_cb),
+       (menu_selection_done_cb):
+       * src/color-combo.h:
+               The glColorCombo widget has been modified to be a
+               single button
+               that is only used to change the selected color.
+       * src/color-swatch.c: (gl_color_swatch_init), (expose_event_cb):
+               Draw on parent containers window to allow an effective
+               transparency.
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_prepare_fill_page):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page):
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_prepare_shadow_page):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page):
+       * src/prefs-dialog.c: (construct_object_page):
+               Change how ColorCombos are packed so that they don't
+               expand to fill hbox.
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties), (update_text_properties),
+       (update_fill_color), (update_line_color), (text_color_changed_cb),
+       (fill_color_changed_cb), (line_color_changed_cb),
+       (set_doc_items_sensitive), (set_text_items_sensitive),
+       (set_fill_items_sensitive), (set_line_color_items_sensitive):
+               The property bar now uses the new glColorButton instead of
+               glColorCombo.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@869
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+C068   glabels2/src/color-combo.c      glabels2/src/color-button.c
+C053   glabels2/src/color-combo.h      glabels2/src/color-button.h
+M      glabels2/src/color-combo.c
+M      glabels2/src/color-combo.h
+M      glabels2/src/color-swatch.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/ui-property-bar.c
+
+commit 1029782c2edff08531e703a61527eaa8a09f9633
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-03
+
+    2009-09-02 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-mini-preview.h:
+       * src/mini-preview.h:
+       * src/mini-preview.c:
+               - Renamed WdgtMiniPreview to MiniPreview.
+               - Style cleanup.
+               - Modified to draw to parent window to be effectively
+               transparent.
+               - Updated license notification to gpl3+.
+       * src/template-designer.c: (construct_layout_page),
+       (layout_page_prepare_cb), (layout_page_changed_cb):
+       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct),
+       (sheets_radio_cb), (first_spin_cb), (last_spin_cb),
+       (preview_pressed):
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct),
+       (spin_cb), (preview_clicked), (gl_wdgt_print_merge_set_copies):
+               - Reconciled with rename above.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@868
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+R058   glabels2/src/wdgt-mini-preview.c
+glabels2/src/mini-preview.c
+A      glabels2/src/mini-preview.h
+M      glabels2/src/template-designer.c
+D      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+
+commit d780283920166f23fb7fdbe1d7f0385b692f0d4c
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-02
+
+    2009-09-01 Jim Evins  <evins@snaught.com>
+
+       * data/builder/object-editor.builder:
+               Fixed errant expansion of tab.
+       * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
+       * src/bc-postnet.c: (gl_barcode_postnet_new):
+       * src/bc.c: (id_to_index), (name_to_index):
+       * src/label-barcode.c: (gl_label_barcode_set_props):
+       * src/label-text.c: (set_font_family):
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_construct):
+       * src/merge.c: (gl_merge_description_to_name):
+       * src/new-label-dialog.c:
+       * src/object-editor-edit-page.c:
+       * src/object-editor-image-page.c: (update_preview_cb):
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-size-page.c:
+       * src/object-editor.c: (gl_object_editor_new):
+       * src/prefs-dialog.c: (update_locale_page_from_prefs):
+       * src/prefs-model.c: (string_to_units):
+       * src/print-op.c: (create_custom_widget_cb):
+       * src/template-designer.c: (gl_template_designer_init),
+       (pg_size_page_changed_cb), (build_template):
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+       * src/xml-label.c: (xml_parse_pixdata):
+               Fixed various deprecations as of Gtk-2.16.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@867
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/object-editor.builder
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc.c
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-text.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/print-op.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-commands.c
+M      glabels2/src/xml-label.c
+
+commit 7bc8e820df3c2380479df0f93601466d981e2295
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-02
+
+    Adding missing Changelog and removed files that should not have been
+    checked in.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@866
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/qrencode-3.1.0/ChangeLog
+D      glabels2/qrencode-3.1.0/Makefile
+D      glabels2/qrencode-3.1.0/Makefile.in
+
+commit 6f54e1fc51bfe8c0cbe60ab7c321320eda020323
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-01
+
+    2009-08-31 Jim Evins  <evins@snaught.com>
+
+       * po/fr.po:
+               Updated french translation (Claude Paroz)
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@865
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/fr.po
+
+commit d701d4f532af82224b880a18ab89cb8d6c1f65fa
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-09-01
+
+    2009-08-31 Jim Evins  <evins@snaught.com>
+
+       * data/builder/property-bar.builder:
+               Make sure event box does not obscure tool bar background.
+       * src/Makefile.am:
+       * src/color-swatch.c:
+       * src/color-swatch.h:
+               New color swatch widget.
+       * src/color-combo-color-menu-item.c:
+       (gl_color_combo_color_menu_item_init),
+       (gl_color_combo_color_menu_item_new),
+       (gl_color_combo_color_menu_item_set_color):
+       * src/color-combo.c: (gl_color_combo_init),
+       (gl_color_combo_finalize), (gl_color_combo_new),
+       (gl_color_combo_set_color), (menu_color_changed_cb):
+               Updated to use new color swatch widget.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@863
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/property-bar.builder
+M      glabels2/src/Makefile.am
+M      glabels2/src/color-combo-color-menu-item.c
+M      glabels2/src/color-combo.c
+A      glabels2/src/color-swatch.c
+A      glabels2/src/color-swatch.h
+
+commit 216c039e5797b6c3bada83668ec7227728a070f3
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-08-27
+
+    2009-08-26 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+               Explicitely mark file types.  Removed unneeded file from
+               libbarcode.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@862
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+
+commit cbfdf9f8ce58c238a8eb5535c617599ad5570d1f
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-08-23
+
+    2009-08-23 Jim Evins  <evins@snaught.com>
+
+       * data/builder/Makefile.am:
+       * data/builder/merge-properties-dialog.builder:
+       * data/builder/merge-properties-dialog.glade:
+       * data/builder/new-label-dialog.builder:
+       * data/builder/new-label-dialog.glade:
+       * data/builder/object-editor.builder:
+       * data/builder/object-editor.glade:
+       * data/builder/prefs-dialog.builder:
+       * data/builder/prefs-dialog.glade:
+       * data/builder/print-custom-widget.builder:
+       * data/builder/print-custom-widget.glade:
+       * data/builder/property-bar.builder:
+       * data/builder/property-bar.glade:
+       * data/builder/template-designer.builder:
+       * data/builder/template-designer.glade:
+       * data/builder/wdgt-media-select.builder:
+       * data/builder/wdgt-media-select.glade:
+       * po/POTFILES.in:
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_finalize),
+       (gl_merge_properties_dialog_construct):
+       * src/new-label-dialog.c: (gl_new_label_dialog_finalize),
+       (gl_new_label_dialog_construct):
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
+       * src/object-editor-data-page.c:
+       (gl_object_editor_prepare_data_page):
+       * src/object-editor-edit-page.c:
+       (gl_object_editor_prepare_edit_page):
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_prepare_fill_page):
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page):
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_prepare_lsize_page):
+       * src/object-editor-position-page.c:
+       (gl_object_editor_prepare_position_page):
+       * src/object-editor-private.h:
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_prepare_shadow_page):
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page):
+       * src/object-editor.c: (gl_object_editor_init),
+       (gl_object_editor_finalize):
+       * src/prefs-dialog.c: (gl_prefs_dialog_init),
+       (gl_prefs_dialog_finalize), (gl_prefs_dialog_construct),
+       (construct_locale_page), (construct_object_page):
+       * src/print-op.c: (gl_print_op_finalize),
+       (gl_print_op_set_settings), (create_custom_widget_cb):
+       * src/template-designer.c: (gl_template_designer_init),
+       (gl_template_designer_finalize), (construct_start_page),
+       (construct_name_page), (construct_pg_size_page),
+       (construct_shape_page), (construct_rect_size_page),
+       (construct_round_size_page), (construct_cd_size_page),
+       (construct_nlayouts_page), (construct_layout_page),
+       (construct_finish_page):
+       * src/ui-property-bar.c: (gl_ui_property_bar_finalize),
+       (gl_ui_property_bar_construct):
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
+       (gl_wdgt_media_select_construct):
+               Builder files no longer built from glade files.
+               Also did some
+               cleanup on formatting and update license notifications
+               to GPL3+.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@861
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/Makefile.am
+A      glabels2/data/builder/merge-properties-dialog.builder
+D      glabels2/data/builder/merge-properties-dialog.glade
+A      glabels2/data/builder/new-label-dialog.builder
+D      glabels2/data/builder/new-label-dialog.glade
+A      glabels2/data/builder/object-editor.builder
+D      glabels2/data/builder/object-editor.glade
+A      glabels2/data/builder/prefs-dialog.builder
+D      glabels2/data/builder/prefs-dialog.glade
+A      glabels2/data/builder/print-custom-widget.builder
+D      glabels2/data/builder/print-custom-widget.glade
+A      glabels2/data/builder/property-bar.builder
+D      glabels2/data/builder/property-bar.glade
+A      glabels2/data/builder/template-designer.builder
+D      glabels2/data/builder/template-designer.glade
+A      glabels2/data/builder/wdgt-media-select.builder
+D      glabels2/data/builder/wdgt-media-select.glade
+M      glabels2/po/POTFILES.in
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/print-op.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 6f1394ef48f3a3fd4efb06247cced9db2fdb6d54
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-08-14
+
+    2009-08-13 Jim Evins  <evins@snaught.com>
+
+       * src/color-combo-color-menu-item.c:
+       (gl_color_combo_color_menu_item_init),
+       (gl_color_combo_color_menu_item_new),
+       (gl_color_combo_color_menu_item_set_color):
+               Explicitly request size of menu item and enlarge color
+               swatch.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@860
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/color-combo-color-menu-item.c
+
+commit 29355781ab15fccd774aba068d4965f07d75f8ca
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-08-14
+
+    Fixed typo in header.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@859
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/common_php.inc
+
+commit 6f7963a0bf6a6e0c6dac3d94475cd56c71b220bf
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-08-12
+
+    2009-08-12 Jim Evins  <evins@snaught.com>
+
+       * src/label-text.c: (buffer_changed_cb), (draw_object),
+       (draw_shadow), (draw_text_real):
+       * src/label-text.h:
+               Moved common code from draw_object() and draw_shadow() to
+               draw_text_real().  Also cleaned up formatting and updated
+               license notification to GPL3+.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@858
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+
+commit ef5fdef2965be8977c6814148d1fe6241be8b446
+Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
+Date:  2009-07-29
+
+    Updated and fixed Russian translation
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@857
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/ru.po
+
+commit 2d2bbdf3aadf183a122a7e26f39a2e10814edaa9
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-07-27
+
+    2009-07-26 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * COPYING.README_FIRST:
+       * Makefile.am:
+       * configure.in:
+       * qrencode-3.1.0/*
+               Added 3rd party qrencode library.
+       * src/Makefile.am:
+       * src/bc-iec18004.c: (gl_barcode_iec18004_new), (render_iec18004):
+       * src/bc-iec18004.h:
+       * src/bc.c:
+               Added IEC18004 (QRCode) 2 dimensional barcode backend.
+               Patch provided by Daniel Mueller <daniel@danm.de>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@856
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/COPYING.README_FIRST
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+M      glabels2/gtk-doc.make
+A      glabels2/qrencode-3.1.0/COPYING
+A      glabels2/qrencode-3.1.0/Doxyfile
+A      glabels2/qrencode-3.1.0/Makefile
+A      glabels2/qrencode-3.1.0/Makefile.am
+A      glabels2/qrencode-3.1.0/Makefile.am.dist
+A      glabels2/qrencode-3.1.0/Makefile.in
+A      glabels2/qrencode-3.1.0/Makefile.in.dist
+A      glabels2/qrencode-3.1.0/NEWS
+A      glabels2/qrencode-3.1.0/README
+A      glabels2/qrencode-3.1.0/README.glabels
+A      glabels2/qrencode-3.1.0/TODO
+A      glabels2/qrencode-3.1.0/acinclude.m4
+A      glabels2/qrencode-3.1.0/aclocal.m4
+A      glabels2/qrencode-3.1.0/autogen.sh
+A      glabels2/qrencode-3.1.0/bitstream.c
+A      glabels2/qrencode-3.1.0/bitstream.h
+A      glabels2/qrencode-3.1.0/config.h.in
+A      glabels2/qrencode-3.1.0/configure
+A      glabels2/qrencode-3.1.0/configure.ac.dist
+A      glabels2/qrencode-3.1.0/libqrencode.pc.in
+A      glabels2/qrencode-3.1.0/mask.c
+A      glabels2/qrencode-3.1.0/mask.h
+A      glabels2/qrencode-3.1.0/qrenc.c
+A      glabels2/qrencode-3.1.0/qrencode.1.in
+A      glabels2/qrencode-3.1.0/qrencode.c
+A      glabels2/qrencode-3.1.0/qrencode.h
+A      glabels2/qrencode-3.1.0/qrencode.spec
+A      glabels2/qrencode-3.1.0/qrencode.spec.in
+A      glabels2/qrencode-3.1.0/qrencode_inner.h
+A      glabels2/qrencode-3.1.0/qrinput.c
+A      glabels2/qrencode-3.1.0/qrinput.h
+A      glabels2/qrencode-3.1.0/qrspec.c
+A      glabels2/qrencode-3.1.0/qrspec.h
+A      glabels2/qrencode-3.1.0/rscode.c
+A      glabels2/qrencode-3.1.0/rscode.h
+A      glabels2/qrencode-3.1.0/split.c
+A      glabels2/qrencode-3.1.0/split.h
+A      glabels2/qrencode-3.1.0/tests/Makefile.am
+A      glabels2/qrencode-3.1.0/tests/Makefile.in
+A      glabels2/qrencode-3.1.0/tests/common.h
+A      glabels2/qrencode-3.1.0/tests/create_frame_pattern.c
+A      glabels2/qrencode-3.1.0/tests/frame
+A      glabels2/qrencode-3.1.0/tests/prof_qrencode.c
+A      glabels2/qrencode-3.1.0/tests/test_all.sh
+A      glabels2/qrencode-3.1.0/tests/test_bitstream.c
+A      glabels2/qrencode-3.1.0/tests/test_estimatebit.c
+A      glabels2/qrencode-3.1.0/tests/test_monkey.c
+A      glabels2/qrencode-3.1.0/tests/test_qrencode.c
+A      glabels2/qrencode-3.1.0/tests/test_qrinput.c
+A      glabels2/qrencode-3.1.0/tests/test_qrspec.c
+A      glabels2/qrencode-3.1.0/tests/test_rs.c
+A      glabels2/qrencode-3.1.0/tests/test_split.c
+A      glabels2/qrencode-3.1.0/tests/view_qrcode.c
+A      glabels2/qrencode-3.1.0/use/compile
+A      glabels2/qrencode-3.1.0/use/config.guess
+A      glabels2/qrencode-3.1.0/use/config.sub
+A      glabels2/qrencode-3.1.0/use/depcomp
+A      glabels2/qrencode-3.1.0/use/install-sh
+A      glabels2/qrencode-3.1.0/use/ltmain.sh
+A      glabels2/qrencode-3.1.0/use/missing
+M      glabels2/src/Makefile.am
+A      glabels2/src/bc-iec18004.c
+A      glabels2/src/bc-iec18004.h
+M      glabels2/src/bc.c
+
+commit eedb5bf0e10f9fa4feb1137381f2aa2e5cf33f28
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-07-26
+
+    2009-07-25 Jim Evins  <evins@snaught.com>
+
+       * src/xml-label.c: (gl_xml_label_open):
+               Relax limits when parsing file.  Allows large embedded
+               image
+               files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@855
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/xml-label.c
+
+commit 568ea135699a47a3286106356fb9928ad10adc5f
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-07-20
+
+    Added compiling-from-source directions.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@854
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/doc/index.php
+A      web/doc/install-src/index.php
+M      web/download/index.php
+M      web/index.php
+M      web/links/index.php
+M      web/news/index.php
+
+commit 0e0af532e4b99123832cefa84e54d395c949f336
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-20
+
+    2009-05-19 Jim Evins  <evins@purple>
+
+       * configure.in:
+       * po/LINGUAS:
+               Moved translation list from configure.in to po/LINGUAS.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@852
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+A      glabels2/po/LINGUAS
+
+commit de5160282bb632146ffe6810f845dcea4cb22e2f
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-20
+
+    2009-05-19 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * po/zh_CN.po:
+               New Chinese translation (Careon
+               <zzbusagain@yahoo.com.cn>).
+       * AUTHORS:
+               Added above translation to acknowledgements.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@851
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+A      glabels2/po/zh_CN.po
+
+commit fac890372fff6be2410f3d0bac332fac8aba3c76
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-18
+
+    2009-05-18 Jim Evins  <evins@snaught.com>
+
+       * src/prefs-model.c: (gl_prefs_model_load_settings):
+               Make an educated guess at locale settings when run for the
+               first time.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@849
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/prefs-model.c
+
+commit 6fb8d93a2091a644e15ce3b2a8760a037aa1f224
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-18
+
+    2009-05-17 Jim Evins  <evins@snaught.com>
+
+       * help/de/de.po:
+       * help/glabels.omf.in:
+               Adding missing files from last checkin.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@846
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+D      glabels2/help/C/glabels-C.omf
+A      glabels2/help/de/de.po
+A      glabels2/help/glabels.omf.in
+
+commit 37a920e876ef4e7c019554be12caec3ff17bd030
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-18
+
+    2009-05-17 Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+       * configure.in:
+       * help/C/glabels-C.omf:
+       * help/C/glabels.xml:
+       * help/Makefile.am:
+       * po/de.po:
+               Updated german translation, gnome-doc-utils support and
+               german translation of glabels manual (Mario Blättermann).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@845
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+M      glabels2/help/C/glabels-C.omf
+M      glabels2/help/C/glabels.xml
+M      glabels2/help/Makefile.am
+M      glabels2/po/de.po
+
+commit dd9de9b237713197a38a600b167e2463f8391a25
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-05-02
+
+    2009-05-01 Jim Evins  <evins@purple>
+
+       * AUTHORS:
+       * configure.in:
+       * po/ca.po:
+               Added catalan translation (David Planella).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@843
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+A      glabels2/po/ca.po
+
+commit 53eaba2de44181026372fd2e512021ff4ab01ac6
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-04-30
+
+    2009-04-29 Jim Evins  <evins@purple>
+
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-us-templates.xml:
+               Caught up on user submitted templates.
+       * AUTHORS:
+               Acknowledgements for above templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@838
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+
+commit 88df0a84494022b59684c6fc997fcc001905cffc
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-04-30
+
+    2009-04-29 Jim Evins  <evins@purple>
+
+       * po/POTFILES.in:
+       * po/de.po:
+               Updated german translation (Mario Blättermann).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@835
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+D      glabels2/po/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/po/de.po
+
+commit 3d49690351c8f4fa5a46e15208a71e26de9e045e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-04-20
+
+    Updated links.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@832
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/links/index.php
+
+commit 80018e80624e22e2d44239f4fd07401acfbb19ad
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-04-12
+
+    Website updates.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@831
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/links/index.php
+
+commit 27432959aa92808be3edff2a3317cad6341f57ec
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-03-25
+
+    Added links to getdeb packages.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@830
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/links/index.php
+
+commit a861bd74a69cf6163be77d42e0d888f55e2aba4b
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-03-23
+
+    2009-03-23 Jim Evins  <evins@snaught.com>
+
+       * src/glabels-batch.c: (main):
+       * src/glabels.c: (main):
+               Tidy up help option output.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@829
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+
+commit 4aad2f4999b238fe83a47ea51e1f2b0b24ac7fb8
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-02-28
+
+    2009-02-28 Jim Evins  <evins@snaught.com>
+
+       reviewed by: <delete if not using a buddy>
+
+       * src/Makefile.am:
+       * src/base64.c:
+       * src/base64.h:
+               Deleted base64 module.
+       * src/xml-label.c: (xml_parse_pixdata), (xml_create_pixdata):
+               Use glib for base64 support.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@828
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+D      glabels2/src/base64.c
+D      glabels2/src/base64.h
+M      glabels2/src/xml-label.c
+
+commit 7c94e09d4f2968f4699ed6b91f5dbfd18d43ff1a
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-02-23
+
+    2009-02-22 Jim Evins  <evins@snaught.com>
+
+       * src/merge-properties-dialog.h:
+       * src/new-label-dialog.h:
+       * src/object-editor.h:
+       * src/prefs-dialog.h:
+       * src/print-op.h:
+       * src/template-designer.h:
+               Corrected cut&paste errors.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@827
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/new-label-dialog.h
+M      glabels2/src/object-editor.h
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/print-op.h
+M      glabels2/src/template-designer.h
+
+commit 4e719ff243581797720031f50cfa33c835552931
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-02-22
+
+    2009-02-21 JimEvins  <evins@snaught.com>
+
+       * src/prefs-model.c: (gl_prefs_model_save_settings),
+       (gl_prefs_model_load_settings):
+       * src/prefs-model.h:
+       * src/ui-commands.c:
+       * src/ui-property-bar.c:
+       * src/ui.c: (view_ui_item_toggled_cb),
+       (set_app_main_toolbar_style), (set_app_drawing_toolbar_style):
+               Removed tooltip toggling capability, which wasn't working
+               anyway.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@826
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui.c
+
+commit e66208f5c1f1573ab4aa75e0fb734d01ab2688bf
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-02-21
+
+    2009-02-21 JimEvins  <evins@snaught.com>
+
+       * README:
+       * configure.in:
+       * data/builder/object-editor.glade:
+       * data/builder/prefs-dialog.glade:
+       * data/builder/property-bar.glade:
+       * data/builder/template-designer.glade:
+       * gtk-doc.make:
+       * src/color-combo-color-menu-item.c:
+       * src/color-combo-color-menu-item.h:
+       * src/color-combo-menu.h:
+       * src/glabels-batch.c: (main):
+       * src/glabels.c: (main):
+       * src/merge-properties-dialog.h:
+       * src/new-label-dialog.h:
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_prepare_lsize_page), (lsize_prefs_changed_cb):
+       * src/object-editor.h:
+       * src/prefs-dialog.h:
+       * src/print-op.h:
+       * src/template-designer.h:
+       * src/ui-commands.c: (gl_ui_cmd_view_property_bar_tips_toggle),
+       (gl_ui_cmd_help_contents), (gl_ui_cmd_help_about):
+       * src/ui-property-bar.c:
+       * src/ui-property-bar.h:
+       * src/ui-sidebar.c: (gl_ui_sidebar_construct),
+       (selection_changed_cb):
+       * src/ui-sidebar.h:
+       * src/view.h:
+       * src/wdgt-media-select.h:
+       * src/wdgt-merge-menu.h:
+       * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_class_init):
+       * src/wdgt-mini-preview.h:
+       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct):
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
+       * src/wdgt-print-merge.h:
+       * src/wdgt-rotate-label.h:
+       * src/window.h:
+               Removed final dependencies on libgnome and libgnomeui.
+               Removed all currently deprecated symbols as of GTK 2.14.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@825
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/README
+M      glabels2/configure.in
+M      glabels2/data/builder/object-editor.glade
+M      glabels2/data/builder/prefs-dialog.glade
+M      glabels2/data/builder/property-bar.glade
+M      glabels2/data/builder/template-designer.glade
+M      glabels2/gtk-doc.make
+M      glabels2/src/color-combo-color-menu-item.c
+M      glabels2/src/color-combo-color-menu-item.h
+M      glabels2/src/color-combo-menu.h
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/new-label-dialog.h
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/print-op.h
+M      glabels2/src/template-designer.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-sidebar.h
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-merge-menu.h
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/wdgt-rotate-label.h
+M      glabels2/src/window.h
+
+commit 3d4a88e43b50dc93d7a5159c7655204c98ecdd6e
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-02-11
+
+    Make sure all pages still validate.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@824
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/common_php.inc
+M      web/contact/index.php
+M      web/download/index.php
+M      web/faq/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit 785f385b0a34cb02732bbd48d483988c75a0c651
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-01-08
+
+    2009-01-07 Jim Evins  <evins@snaught.com>
+
+       * src/critical-error-handler.c: (critical_error_handler):
+       * src/ui-commands.c: (gl_ui_cmd_help_contents):
+       * src/warning-handler.c: (warning_handler):
+       * src/view.c: (selection_received_cb):
+               Compile without warning with additional CFLAGS of
+               -O1 -Wall -Wformat=2.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@823
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/critical-error-handler.c
+M      glabels2/src/ui-commands.c
+M      glabels2/src/view.c
+M      glabels2/src/warning-handler.c
+
+commit dc8b4a0f9fe720d384aaaf4811a8a990c3a7bbda
+Author: Jim Evins <evins@snaught.com>
+Date:  2009-01-03
+
+    2009-01-02 Jim Evins  <evins@snaught.com>
+
+       * COPYING.README_FIRST:
+               Fixed typo.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@821
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/COPYING.README_FIRST
+M      glabels2/ChangeLog
+
+commit fc11548527b8363cf1595da581fd46a6574f4116
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-28
+
+    2008-12-27 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-other-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/brother-other-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-other-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Make sure all descriptions are marked as translatable.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@819
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-other-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/brother-other-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit 4d4d318a5e7b1a78263d289bae0c41fda99d74b2
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-28
+
+    2008-12-27 Jim Evins  <evins@snaught.com>
+
+       * de.po:
+               Updated german translation (Mario Blättermann)
+       * AUTHORS:
+               Updated credits to reflect above translation.
+       * data/builder/object-editor.glade:
+       * data/builder/prefs-dialog.glade:
+       * data/builder/template-designer.glade:
+               Removed "translatable" attribute from whitespace strings,
+               which are used only to help layout.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@817
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/builder/object-editor.glade
+M      glabels2/data/builder/prefs-dialog.glade
+M      glabels2/data/builder/template-designer.glade
+M      glabels2/po/de.po
+
+commit 324bdb14055546411bd9909753677fa91b22a4c4
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-22
+
+    Release 2.2.4
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@815
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit c5c822b536c68e3820e2d435634f1c4407ede1e9
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-22
+
+    2008-12-21 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+               A couple of recent template submissions.
+       * AUTHORS:
+               Acknowledgements for above templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@811
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+
+commit 7f533d981565aecf7c4ec7f47743b5197e4ea2af
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-21
+
+    2008-12-21 Jim Evins  <evins@snaught.com>
+
+       * src/view.c: (motion_notify_event_cb), (button_press_event_cb):
+               Don't check for handles on aggregate selections.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@809
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view.c
+
+commit 1da3c68162b4aa96021c1d51d6dece3a630a968a
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-21
+
+    Updated development version requirements.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@807
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+
+commit 43adc6cb0e93d294807ff2a6b0e180807983d7da
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-20
+
+    2008-12-20 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Updated prerequisite library versions required.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@806
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit 60afedc9a3de0a1de48b79664299f71384ca2a25
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-19
+
+    Updated FAQ.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@805
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/faq/index.php
+
+commit 5f5fc0b681e7db77307f05ee7fcc7e2236f12467
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-19
+
+    2008-12-18 Jim Evins  <evins@snaught.com>
+
+       * src/view.c: (selection_received_cb):
+               Fixed paste bug that caused a duplicate phantom
+               view_object to be created for
+               each new label_object.  This is because the view now
+               (as of r673) the view
+               monitiors the label for new objects and creates
+               view_objects automatically.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@804
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view.c
+
+commit 31bd44a96ae5c7f2687d2c37f037a386a087ad17
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-15
+
+    2008-12-14 Jim Evins  <evins@snaught.com>
+
+       * src/ui.c: (gl_ui_new):
+               Bug #2395628.  Fixed i18n for application shell.
+       * po/POTFILES.in:
+               Bug #2395628.  Reconciled POTFILES.in with current files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@801
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/src/ui.c
+
+commit 65526d446c2fcef33bd5f786601e312e566b6de9
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-15
+
+    2008-12-14 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Bug #2316013.  Added PKG_PROG_PKG_CONFIG.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@799
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit ae5381bcfb4cfef51379bdd7df40fd461aa0f0d5
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-12-01
+
+    Added link to another linux.com artical.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@797
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/links/index.php
+
+commit f76b27f1dae279463613e58ea6082f6a6711d2e5
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-11-16
+
+    2008-11-15 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c: (lgl_db_register_template):
+       * libglabels/xml-template.c:
+       (lgl_xml_template_parse_template_node):
+       * src/glabels-batch.c:
+       * src/view-text.c: (gl_view_text_create_button_press_event):
+               Fixed several issues such as possible use of uninitialized
+               variables found with "-O1 -Wall".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@796
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/view-text.c
+
+commit b8f1816d53df85e2234b374bf64bbd84249fe667
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-11-10
+
+    2008-11-09 Jim Evins  <evins@snaught.com>
+
+       * data/templates/misc-iso-templates.xml:
+               Another user submitted template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@794
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/misc-iso-templates.xml
+
+commit 20ce4c33fcd64fecba7e403f127ba0c42743c397
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-31
+
+    Added link to nice blog.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@792
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/links/index.php
+
+commit 263be22ce938c604d9de9a20650bcef888f720fd
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-31
+
+    Website changes from last release.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@791
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit 3a0de14d527a044a6ab3f67436df74e4fb5b5c7c
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-28
+
+    2008-10-27 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Caught up on user submitted templates.
+       * AUTHORS:
+               Acknowledgements for above templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@790
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit c9e2de5f7326b9bd172268da0584d6c6e31a7e03
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-24
+
+    2008-10-23 Jim Evins  <evins@snaught.com>
+
+       * src/label-text.c: (set_font_family):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_font_family):
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs):
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties):
+       * src/util.c: (gl_util_get_font_family_list):
+       * src/util.h:
+               Bug #1902275 and Bug #2186214.  Cache font list so that
+               it is not re-created
+               everytime the list is requested.
+       * src/object-editor-text-page.c:
+       (gl_object_editor_set_font_family):
+               Don't change font-family if it hasn't actually changed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@788
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+
+commit dbd84afd35a3b583955817558d598183eadec95f
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-20
+
+    2008-10-19 Jim Evins  <evins@snaught.com>
+
+       * data/builder/object-editor.glade:
+               Some tweaking of builder/glade widgets.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@786
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/builder/object-editor.glade
+
+commit 0dc8ff1f3ef7c7659bc25f59d9a3e364d9214746
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-18
+
+    2008-10-18 Jim Evins  <evins@snaught.com>
+
+       Migrated all use of libglade to GtkBuilder.
+
+       * data/glade/Makefile.am:
+       * data/glade/merge-properties-dialog.glade:
+       * data/glade/new-label-dialog.glade:
+       * data/glade/object-editor.glade:
+       * data/glade/prefs-dialog.glade:
+       * data/glade/print-custom-widget.glade:
+       * data/glade/property-bar.glade:
+       * data/glade/template-designer.glade:
+       * data/glade/wdgt-media-select.glade:
+               Removed data/glade directory.
+       * data/builder/Makefile.am:
+       * data/builder/merge-properties-dialog.glade:
+       * data/builder/new-label-dialog.glade:
+       * data/builder/object-editor.glade:
+       * data/builder/prefs-dialog.glade:
+       * data/builder/print-custom-widget.glade:
+       * data/builder/property-bar.glade:
+       * data/builder/template-designer.glade:
+       * data/builder/wdgt-media-select.glade:
+               Added data/builder directory.
+       * configure.in:
+       * data/Makefile.am:
+       * src/Makefile.am:
+               Change glade to builder.
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_finalize),
+       (gl_merge_properties_dialog_construct):
+       * src/new-label-dialog.c: (gl_new_label_dialog_finalize),
+       (gl_new_label_dialog_construct):
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
+       * src/object-editor-data-page.c:
+       (gl_object_editor_prepare_data_page):
+       * src/object-editor-edit-page.c:
+       (gl_object_editor_prepare_edit_page):
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_prepare_fill_page):
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page):
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_prepare_lsize_page):
+       * src/object-editor-position-page.c:
+       (gl_object_editor_prepare_position_page):
+       * src/object-editor-private.h:
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_prepare_shadow_page):
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page):
+       * src/object-editor.c: (gl_object_editor_init):
+       * src/prefs-dialog.c: (gl_prefs_dialog_init),
+       (gl_prefs_dialog_construct), (construct_locale_page),
+       (construct_object_page):
+       * src/print-op.c: (gl_print_op_finalize),
+       (create_custom_widget_cb):
+       * src/template-designer.c: (gl_template_designer_class_init),
+       (gl_template_designer_finalize), (gl_template_designer_construct),
+       (construct_start_page), (construct_name_page),
+       (construct_pg_size_page), (construct_shape_page),
+       (construct_rect_size_page), (construct_round_size_page),
+       (construct_cd_size_page), (construct_nlayouts_page),
+       (construct_layout_page), (construct_finish_page):
+       * src/template-designer.h:
+       * src/ui-property-bar.c: (gl_ui_property_bar_init),
+       (gl_ui_property_bar_finalize), (gl_ui_property_bar_new),
+       (gl_ui_property_bar_construct), (reset_to_default_properties),
+       (gl_ui_property_bar_set_view), (gl_ui_property_bar_set_tooltips),
+       (update_text_properties), (update_fill_color),
+       (update_line_color),
+       (update_line_width), (selection_changed_cb),
+       (font_family_changed_cb), (font_size_changed_cb),
+       (text_color_changed_cb), (fill_color_changed_cb),
+       (line_color_changed_cb), (line_width_changed_cb),
+       (font_bold_toggled_cb), (font_italic_toggled_cb),
+       (text_align_toggled_cb), (set_doc_items_sensitive),
+       (set_text_items_sensitive), (set_fill_items_sensitive),
+       (set_line_color_items_sensitive),
+       (set_line_width_items_sensitive):
+       * src/ui-property-bar.h:
+       * src/util.c: (gl_util_get_builder_widgets):
+       * src/util.h:
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize),
+       (gl_wdgt_media_select_construct):
+               Migration of glade to builder.
+       * src/color.h:
+               New macros for color combo initialization.
+       * TODO:
+               Added idea for internal merge database.
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/paper.sgml:
+       * gtk-doc.make:
+               Automagic.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@785
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/TODO
+M      glabels2/configure.in
+M      glabels2/data/Makefile.am
+A      glabels2/data/builder/Makefile.am
+R100   glabels2/data/glade/merge-properties-dialog.glade
+glabels2/data/builder/merge-properties-dialog.glade
+R100   glabels2/data/glade/new-label-dialog.glade
+glabels2/data/builder/new-label-dialog.glade
+R097   glabels2/data/glade/object-editor.glade
+glabels2/data/builder/object-editor.glade
+R096   glabels2/data/glade/prefs-dialog.glade
+glabels2/data/builder/prefs-dialog.glade
+R100   glabels2/data/glade/print-custom-widget.glade
+glabels2/data/builder/print-custom-widget.glade
+R089   glabels2/data/glade/property-bar.glade
+glabels2/data/builder/property-bar.glade
+R099   glabels2/data/glade/template-designer.glade
+glabels2/data/builder/template-designer.glade
+R100   glabels2/data/glade/wdgt-media-select.glade
+glabels2/data/builder/wdgt-media-select.glade
+D      glabels2/data/glade/Makefile.am
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+M      glabels2/gtk-doc.make
+M      glabels2/src/Makefile.am
+M      glabels2/src/color.h
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/print-op.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.h
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/wdgt-media-select.c
+
+commit 7ef35253c18443a10f4f38d53143341c09c06015
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-10-12
+
+    2008-10-12 Jim Evins  <evins@snaught.com>
+
+       * src/mygal/Makefile.am:
+       * src/mygal/color-group.c:
+       * src/mygal/color-group.h:
+       * src/mygal/color-palette.c:
+       * src/mygal/color-palette.h:
+       * src/mygal/e-colors.c:
+       * src/mygal/e-colors.h:
+       * src/mygal/e-marshal.list:
+       * src/mygal/e-util.h:
+       * src/mygal/mygal-combo-box.c:
+       * src/mygal/mygal-combo-box.h:
+       * src/mygal/widget-color-combo.c:
+       * src/mygal/widget-color-combo.h:
+       * AUTHORS:
+       * configure.in:
+               Deleted mygal.
+       * src/color-combo.c:
+       * src/color-combo.h:
+       * src/color-combo-color-menu-item.c:
+       * src/color-combo-color-menu-item.h:
+       * src/color-combo-history.c:
+       * src/color-combo-history.h:
+       * src/color-combo-menu.c:
+       * src/color-combo-menu.h:
+       * src/marshal.list:
+       * src/util.c:
+       * src/util.h:
+       * src/Makefile.am:
+               Created new glColorCombo widget.
+       * src/object-editor-bc-page.c:
+       * src/object-editor-edit-page.c:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-line-page.c:
+       * src/object-editor-shadow-page.c:
+       * src/object-editor-text-page.c:
+       * src/object-editor.c:
+       * src/prefs-dialog.c:
+       * src/ui-property-bar.c:
+               Replaced use of mygal color combo with new glColorCombo
+               widget.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@784
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/color-combo-color-menu-item.c
+A      glabels2/src/color-combo-color-menu-item.h
+A      glabels2/src/color-combo-history.c
+A      glabels2/src/color-combo-history.h
+A      glabels2/src/color-combo-menu.c
+A      glabels2/src/color-combo-menu.h
+A      glabels2/src/color-combo.c
+A      glabels2/src/color-combo.h
+M      glabels2/src/marshal.list
+D      glabels2/src/mygal/Makefile.am
+D      glabels2/src/mygal/color-group.c
+D      glabels2/src/mygal/color-group.h
+D      glabels2/src/mygal/color-palette.c
+D      glabels2/src/mygal/color-palette.h
+D      glabels2/src/mygal/e-colors.c
+D      glabels2/src/mygal/e-colors.h
+D      glabels2/src/mygal/e-marshal.list
+D      glabels2/src/mygal/e-util.h
+D      glabels2/src/mygal/mygal-combo-box.c
+D      glabels2/src/mygal/mygal-combo-box.h
+D      glabels2/src/mygal/widget-color-combo.c
+D      glabels2/src/mygal/widget-color-combo.h
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+
+commit 6accda9df32944d48b5e8556c5b7d4fd6e37b485
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-08-30
+
+    2008-08-29 Jim Evins  <evins@snaught.com>
+
+       * src/file.c: (gl_file_open), (gl_file_save_as):
+               Bug #2069668.  Corrected button order in Open and
+               "Save as"
+               dialogs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@783
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/file.c
+
+commit 7b353782309c9627b471bd5928d836e4ed380e9b
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-08-17
+
+    2008-08-17 Jim Evins  <evins@snaught.com>
+
+       * data/dtd/glabels-2.2.dtd:
+       * data/templates/paper-sizes.xml:
+       * libglabels/db.c: (lgl_db_init):
+       * libglabels/paper.c: (lgl_paper_new), (lgl_paper_dup),
+       (lgl_paper_free):
+       * libglabels/paper.h:
+       * libglabels/xml-paper.c: (lgl_xml_paper_parse_paper_node):
+       * src/print-op.c: (set_page_size):
+               Bug #2049431.  Always explicitely set page size.
+               Added pwg_size field (PWG 5101.1-2002
+               size specification) to the libglabels paper database to
+               allow the page size to be
+               communicated to GtkPrintOp un-ambiguously.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@777
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/dtd/glabels-2.2.dtd
+M      glabels2/data/templates/paper-sizes.xml
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/src/print-op.c
+
+commit a4e50ffadf1d9aaf6d3fdd6fa88a4a144652be70
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-07-26
+
+    2008-07-25 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-size-page.c: (size_reset_cb),
+       (gl_object_editor_set_max_size):
+               Bug #1993550.  Set size limits based on longest side
+               of label.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@776
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-size-page.c
+
+commit d842a8e3b41ef987d9f402f80a5ea19f2cc8528f
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-07-20
+
+    2008-07-19 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * src/mygal/Makefile.am:
+               Make sure libtool handles library dependencies for mygal
+               properly.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@774
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/mygal/Makefile.am
+
+commit c046a8d5f2adcabf208bf344ae2d49b2c35d9563
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-05-22
+
+    2008-05-21 Jim Evins  <evins@snaught.com>
+
+       * src/glabels-batch.c: (main):
+               Bug #1968653.  Initialize prefs subsystem.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@772
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/glabels-batch.c
+
+commit a3fb8ada88270c000ca8ed92552df8bd73e43b81
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-05-10
+
+    2008-05-09 Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+               Bug #1959135.  A couple of radio buttons somehow became
+               ungrouped.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@769
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+
+commit 85c07ac71aaff4903c38f816ae77c5932754512b
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-04-08
+
+    2008-04-07 Jim Evins  <evins@snaught.com>
+
+       * src/wdgt-rotate-label.h:
+       * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_init),
+       (gl_wdgt_rotate_label_new), (toggled_cb), (create_pixbuf),
+       (gl_wdgt_rotate_label_get_state),
+       (gl_wdgt_rotate_label_set_state),
+       (gl_wdgt_rotate_label_set_template_name):
+               Modified wdgt-rotate-label to better indicate the
+               rotation choices.
+       * data/glade/Makefile.am:
+       * data/glade/wdgt-rotate-label.glade:
+               Deleted wdgt-rotate-label.glade.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@768
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/Makefile.am
+D      glabels2/data/glade/wdgt-rotate-label.glade
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+
+commit cec0279eb60ae357ff93ef662a432b979160a303
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-04-05
+
+    2008-04-04 Jim Evins  <evins@snaught.com>
+
+       * data/templates/brother-other-templates.xml:
+               Added categories to existing templates.
+       * data/templates/misc-other-templates.xml:
+               Moved dymo templates to their own file.
+       * data/templates/Makefile.am:
+       * data/templates/dymo-other-templates.xml:
+               Additional dymo templates provided by Harald Welte
+               <laforge@gnumonks.org>.
+       * AUTHORS:
+               Acknowledgement for above templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@767
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/data/templates/dymo-other-templates.xml
+
+commit 49497c2580870b2a1b2364e4da33e4587efae50a
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-04-05
+
+    2008-04-04 Jim Evins  <evins@snaught.com>
+
+       * data/templates/brother-other-templates.xml:
+               Added categories to existing templates.
+       * data/templates/misc-other-templates.xml:
+               Moved dymo templates to their own file.
+       * data/templates/Makefile.am:
+       * data/templates/dymo-other-templates.xml:
+               Additional dymo templates provided by Harald Welte
+               <laforge@gnumonks.org>.
+       * AUTHORS:
+               Acknowledgement for above templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@766
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/Makefile.am
+M      glabels2/data/templates/brother-other-templates.xml
+M      glabels2/data/templates/misc-other-templates.xml
+
+commit 0bd0009193b9e28d4ddf96028399f038996d15d5
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-03-25
+
+    2008-03-24 Jim Evins  <evins@snaught.com>
+
+       * src/xml-label.c: (xml_doc_to_label):
+               Bug #1872584.  Don't refuse to parse label file if
+               namespace is
+               unrecognized -- it may be from a newer version of glabels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@763
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/xml-label.c
+
+commit 5f3c093d8b3d6aeef8a9e477481b0bdc7728c65b
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-03-16
+
+    2008-03-15 Jim Evins  <evins@snaught.com>
+
+       * data/templates/Makefile.am:
+       * data/templates/brother-other-templates.xml:
+               Added brother templates.
+       * src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path),
+       (gl_cairo_markup_margin_cd_path):
+       * src/view.c: (draw_markup_layer):
+               Fixed markup drawing errors when label is rotated.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@762
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/Makefile.am
+A      glabels2/data/templates/brother-other-templates.xml
+M      glabels2/src/cairo-markup-path.c
+M      glabels2/src/view.c
+
+commit ffb3bb596fd074d8aff5d967f0468d7c47769510
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-03-04
+
+    2008-03-03 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * ko.po:
+               Added korean translation provided by xein@naver.com.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@760
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+A      glabels2/po/ko.po
+
+commit eb9b5b77918c0ca267429d15417370a7af529cbb
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-23
+
+    Release 2.2.2
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@756
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit 22ec28c04b44a74d3dfe10f5667bde6d36637df3
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-22
+
+    2008-02-21 Jim Evins  <evins@snaught.com>
+
+       * src/ui.c:
+               Fixed typo that prevented "Save" from being deactivated
+               when
+               document is not modified.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@755
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui.c
+
+commit 23cbe3a3256f0edd295a7d4fc0c92c2de23e5e9c
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-19
+
+    2008-02-18 Jim Evins  <evins@snaught.com>
+
+       * src/prefs-model.c: (gl_prefs_model_save_settings),
+       (gl_prefs_model_load_settings):
+               Set default units for file output.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@752
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/prefs-model.c
+
+commit 4618bceeaf24715211c17ca9585e7a807b4df814
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-18
+
+    2008-02-18 Jim Evins  <evins@snaught.com>
+
+       * help/C/glabels.xml:
+               Fixed example template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@750
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/help/C/glabels.xml
+
+commit 41999df6e9a40596e0e6986813b70f3f360c9b0e
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-17
+
+    2008-02-16 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-us-templates.xml:
+               Caught up on user submitted templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@748
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+
+commit 9e0bdc8ba7b36e33843fa7ba8baf496db7a41b88
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-05
+
+    2008-02-04 Jim Evins  <evins@snaught.com>
+
+       * src/view-image.c: (update_object_from_editor_cb):
+               Bug #1886438.  Don't update the image size unless it
+               is actually
+               triggered by a change in image source.  The result of
+               this bug
+               was that any attempt to edit the size spinboxes,
+               immediately
+               reset the size.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@746
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view-image.c
+
+commit 91d37cb324c418683201aa5c25bd013789286831
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-03
+
+    2008-02-03 Jim Evins  <evins@snaught.com>
+
+       * src/label-image.c: (gl_label_image_class_init), (set_size):
+               Enforce minimum size for images.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@743
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-image.c
+
+commit d9e0dd7675822598ed33528baa97c41d68b617e2
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-03
+
+    2008-02-03 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-edit-page.c: (field_selected_cb):
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_set_max_lsize):
+       * src/object-editor-private.h:
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_set_max_shadow_offset):
+       * src/object-editor-size-page.c: (gl_object_editor_set_max_size):
+       * src/object-editor.c: (gl_object_editor_finalize),
+       (gl_object_editor_new), (gl_object_notebook_construct_valist),
+       (label_changed_cb):
+       * src/object-editor.h:
+       * src/ui-sidebar.c: (gl_ui_sidebar_construct):
+       * src/view-barcode.c: (construct_properties_editor):
+       * src/view-box.c: (construct_properties_editor):
+       * src/view-ellipse.c: (construct_properties_editor):
+       * src/view-image.c: (construct_properties_editor):
+       * src/view-line.c: (construct_properties_editor):
+       * src/view-object.c: (gl_view_object_finalize):
+       * src/view-text.c: (construct_properties_editor),
+               Move update_editor_from_label callback from individual
+               view objects
+               to the object editor, so that signals can be disconnected
+               when
+               object editor is finalized.
+       * src/view-text.c: (gl_view_text_create_button_press_event):
+               Fixed bug that caused multiple view objects to be created
+               for a
+               single text object.  This bug would manifest itself as
+               a crash
+               when deleting multi-object selections which included
+               text objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@741
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-text.c
+
+commit b4714e50f777fe29eb16a2d729e8b5692ade6c88
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-02
+
+    2008-02-02 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/wdgt-merge-menu.c:
+       * src/wdgt-merge-menu.h:
+       * src/debug.c: (gl_debug_init):
+       * src/debug.h:
+       * src/marshal.list:
+               New merge menu widget.
+       * data/glade/object-editor.glade:
+       * src/object-editor-private.h:
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+       * src/object-editor-edit-page.c:
+       (gl_object_editor_prepare_edit_page), (field_selected_cb),
+       (insert_button_cb):
+               Simplified UI for inserting fields into text objects
+               by launching
+               a merge menu and directly inserting fields from the menu.
+               No more
+               selecting field in combobox, then pressing insert button.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@740
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/src/Makefile.am
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/marshal.list
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor.c
+A      glabels2/src/wdgt-merge-menu.c
+A      glabels2/src/wdgt-merge-menu.h
+
+commit b9efddafae059c1834ee10d3d7aedf9a23a1aea9
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-02-01
+
+    2008-01-31 Jim Evins  <evins@snaught.com>
+
+       * src/label-barcode.c: (draw_object):
+               Fixed rendering problem when "Invalid data" is displayed
+               when text
+               object is lower in stacking order.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@738
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-barcode.c
+
+commit 34ce1482d3abe34922ef9bc8d0173ec98c74f1c0
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-31
+
+    2008-01-30 Jim Evins  <evins@snaught.com>
+
+       * src/label-text.c: (get_size), (draw_object), (draw_shadow):
+               Don't turn off cairo_hint_metrics.  This causes serious
+               issues with
+               bitmap fonts.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@736
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-text.c
+
+commit c3eb26e0dc3c7c4ae2dfd150d15ac2dfdda751b2
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-30
+
+    2008-01-29 Jim Evins  <evins@snaught.com>
+
+       * src/print-op.c: (gl_print_op_construct),
+       (gl_print_op_construct_batch), (set_page_size):
+               Explicitly set page size for "other" page sizes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@734
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print-op.c
+
+commit 30a30cddd30848ddb8c27bd3883e355c5f455aee
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-26
+
+    2008-01-25 Jim Evins  <evins@snaught.com>
+
+       * src/bc.c:
+               Fixed Code128C backend parameters.
+       * src/label-barcode.c: (get_size):
+               Bug #1766425.  If barcode is not renderable with either
+               input data or default data, use a default size.  Also
+               fixed small leak.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@733
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/bc.c
+M      glabels2/src/label-barcode.c
+
+commit f92a36a65a99196ea77369e36306ef012713c1f0
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-23
+
+    Release 2.2.1
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@729
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit b3284942b4787e79360f989f39573cf4db05be2b
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-17
+
+    2008-01-16 Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (print_label):
+               Bug #1872568.  Don't apply special transforms (rotate and
+               mirror) to clipping region or outline.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@727
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+
+commit 4fc7a95ffe11cda0bdfd9074cb8ee5d41e6d4434
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-02
+
+    2008-01-01 Jim Evins  <evins@snaught.com>
+
+       * src/util.c:
+               Sort font lists alphabetically.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@725
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/util.c
+
+commit 2405b022fb9d95b98b20ad37de761fdb885b3d86
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-02
+
+    2008-01-01 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c:
+               Do a case-insensitive sort.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@723
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+
+commit 0f866d1aacfc4da617ae484b6c0873ff08909b6e
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-02
+
+    2008-01-01 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c:
+               Sort evolution by "file_under" field.  Original patch
+               provided
+               by Peter Cherriman <glabels-devel2712@bubieyehyeh.me.uk>
+               in
+               Patch #1860423.
+       * AUTHORS:
+               Added acknowledgement for above patch.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@721
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+
+commit 2c6f4ad2ae25e3feb6bec338a727689663479fbf
+Author: Jim Evins <evins@snaught.com>
+Date:  2008-01-02
+
+    2008-01-01 Jim Evins  <evins@snaught.com>
+
+       * NEWS:
+       * configure.in:
+       * glabels.spec.in:
+               Reconcile with 2.2 branch.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@719
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+M      glabels2/configure.in
+M      glabels2/glabels.spec.in
+
+commit 2dc21eca4a51c1e9a96a2ad2b8a308b75b8450a5
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-26
+
+    Prep for 2.2.0 release.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@716
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      web/doc/glabels-2.2.dtd.txt
+M      web/doc/index.php
+A      web/doc/templates-2.2/glabels-template-cd.png
+A      web/doc/templates-2.2/glabels-template-label.png
+A      web/doc/templates-2.2/glabels-template-layout.png
+A      web/doc/templates-2.2/index.php
+M      web/download/index.php
+M      web/index.php
+M      web/links/index.php
+M      web/news/index.php
+A      web/screenshots/220-screenshot-main-thumb.png
+A      web/screenshots/220-screenshot-main.png
+A      web/screenshots/220-screenshot-new-thumb.png
+A      web/screenshots/220-screenshot-new.png
+A      web/screenshots/220-screenshot-preview-thumb.png
+A      web/screenshots/220-screenshot-preview.png
+A      web/screenshots/220-screenshot-print-thumb.png
+A      web/screenshots/220-screenshot-print.png
+M      web/screenshots/index.php
+
+commit 8836dd00ecb2dca5462442a6149872ec84d9efdc
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-22
+
+    2007-12-21 Jim Evins  <evins@snaught.com>
+
+       * COPYING.LIBGLABELS:
+       * COPYING.README_FIRST:
+       * README:
+               Updating license information to make more complete and
+               understandable.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@711
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+R100   glabels2/COPYING.LIBGLABELS     glabels2/COPYING-LIBGLABELS
+A      glabels2/COPYING.README_FIRST
+M      glabels2/ChangeLog
+M      glabels2/README
+
+commit 5375ec7401a13e0749329bc34d912cbffbee2b6f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-16
+
+    2007-12-16 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Updated version to 2.pre2.
+       * help/C/glabels.xml:
+               Updated documentation.
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+               Updated copyright string.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@710
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/help/C/glabels.xml
+M      glabels2/src/ui-commands.c
+
+commit 63153b839d3534ecd8f8761ffa78963a1b9a3918
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-16
+
+    2007-12-15 Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+               Removed any GtkTable that contained a GtkComboBox because
+               the size of
+               the combo box was not constrained properly.  This
+               sacrifices the nice
+               orderly labels for combo boxes that don't extend beyond
+               the edge of the
+               window.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@709
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+
+commit a80d06dfd7b2b2a0ad6fefb8930bf29e0da47bd8
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-15
+
+    2007-12-15 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c: (lgl_db_lookup_template_from_name):
+       * src/object-editor.c: (gl_object_editor_finalize):
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_finalize):
+               Fixed several small memory leaks.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@708
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/db.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 910f142b0201ac95fa7c62bf6d1a658e16093f16
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-15
+
+    2007-12-14 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c:
+               Optimize template search by name by using a GHashTable.
+       * src/mini-preview-pixbuf-cache.c:
+       * src/mini-preview-pixbuf-cache.h:
+               Store one pixbuf per template, but use a key for each
+               alias.
+       * src/wdgt-media-select.c:
+               Optimize loading of tree data, thus optimizing the
+               "new label" dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@707
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/db.c
+M      glabels2/src/mini-preview-pixbuf-cache.c
+M      glabels2/src/mini-preview-pixbuf-cache.h
+M      glabels2/src/wdgt-media-select.c
+
+commit 56efcf961c8dad206f835cb6eaa27621a837e457
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-13
+
+    2007-12-12 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+               More templates and aliases.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@706
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-us-templates.xml
+
+commit b84fefc66d9297af2c7987605fba5df694273907
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-09
+
+    Updated download links.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@705
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/common_php.inc
+
+commit 2a503f794c163ad0f8d540e205ecdc689d0d59f0
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-09
+
+    Release 2.1.5
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@702
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+M      web/index.php
+M      web/news/index.php
+
+commit 67f66fd47238547b043f41b566b5176a2512a8b1
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-09
+
+    2007-12-08 Jim Evins  <evins@snaught.com>
+
+       * TODO:
+               More prep for 2.1.5/2.2.0.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@701
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/TODO
+
+commit e40a0e4b96767ad3e127dd5a8698a842faa79013
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-09
+
+    2007-12-08 Jim Evins  <evins@snaught.com>
+
+       * NEWS:
+       * README:
+       * TODO:
+       * configure.in:
+               Preparation for 2.1.5.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@700
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+M      glabels2/README
+M      glabels2/TODO
+M      glabels2/configure.in
+
+commit 61ce763cb6817e0d22b262d9933a3d5d32cd945f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-08
+
+    2007-12-08 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-docs.sgml:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/db.sgml:
+       * docs/libglabels/tmpl/str.sgml:
+       * libglabels/str.c:
+               Documentation cleanup for libglabels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@699
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-docs.sgml
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/db.sgml
+A      glabels2/docs/libglabels/tmpl/str.sgml
+M      glabels2/libglabels/str.c
+
+commit f5cdac62dc40e5f8d3e2f0d33fe645c098d68f06
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-02
+
+    Fixed capitalization.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@698
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/links/index.php
+
+commit 9e63a7ba6a5af8eeac9bf7a008050c3072f35c9c
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-12-02
+
+    Added missing title image. Small edits to links and download pages.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@697
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      web/download/index.php
+A      web/images/glabels-title-140.png
+D      web/images/glabels-title-140.png.good
+M      web/links/index.php
+
+commit 7fc2595f019ca9b9e4ddc8bf04173489c42dada8
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-30
+
+    2007-11-29 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.h:
+       * libglabels/db.c:
+               Added lgl_db_does_template_name_exist().
+               In lgl_db_lookup_template_from_name() substitute
+               brand/part of new template from
+               requested alias.
+       * src/prefs-model.c:
+               Proof read recent templates -- make sure they still exist.
+       * src/wdgt-media-select.c:
+               Default to "search all templates" tab if no recent
+               templates found.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@696
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/db.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 7d3d00e59c9deac3590b2e0cd5b756e66945de9b
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-28
+
+    2007-11-28 Jim Evins  <evins@snaught.com>
+
+       * data/glade/wdgt-media-select.glade:
+       * src/wdgt-media-select.c:
+               Added tabbed notebook to allow selection of recent
+               template versus searching the
+               entire database.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@695
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/wdgt-media-select.glade
+M      glabels2/src/wdgt-media-select.c
+
+commit 5aca44500cc85783f61bd7a572c38645f8513cc0
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-27
+
+    2007-11-26 Jim Evins  <evins@snaught.com>
+
+       * libglabels/Makefile.am:
+       * libglabels/libglabels.h:
+               Make str.h public.
+       * src/label.c:
+       * src/prefs-dialog.c:
+       * src/prefs-model.c:
+       * src/prefs-model.h:
+       * src/prefs.c:
+       * src/prefs.h:
+               Added tracking of recently used templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@694
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/libglabels.h
+M      glabels2/src/label.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+
+commit f16056b8177404142111d3355fa5a3b94839b1d8
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-21
+
+    2007-11-20 Jim Evins  <evins@snaught.com>
+
+       * data/glade/template-designer.glade:
+       * src/template-designer.c:
+               Added warning icon when match brand and part match an
+               existing template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@693
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/template-designer.glade
+M      glabels2/src/template-designer.c
+
+commit 58279423cfb4c6fa816d19f7078fdf1e111fbc55
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-19
+
+    2007-11-18 Jim Evins  <evins@snaught.com>
+
+       * libglabels/Makefile.am:
+       * libglabels/str.h:
+       * libglabels/str.c:
+               Added lgl_str_utf8_casecmp().
+       * libglabels/libglabels-private.h:
+               Use lgl_str_utf8_casecmp() for UTF8_EQUAL macro --
+               do case insensitive comparisons.
+       * libglabels/db.c: (lgl_db_get_brand_list):
+               Use lgl_str_utf8_casecmp() to determine if we have seen
+               brand before when building
+               brand list.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@692
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/libglabels-private.h
+A      glabels2/libglabels/str.c
+C055   glabels2/libglabels/libglabels-private.h
+glabels2/libglabels/str.h
+
+commit ac41c67c4089c1303453fee8efe5c5e97acbc1bd
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-19
+
+    2007-11-18 Jim Evins  <evins@snaught.com>
+
+       * data/glade/template-designer.glade:
+       * src/template-designer.c:
+               Don't advance past name page, if brand and part match
+               an existing template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@691
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/template-designer.glade
+M      glabels2/src/template-designer.c
+
+commit 8afdc497ab84d6fb788e9822a15c24320d686fbe
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-18
+
+    2007-11-18 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c: (lgl_db_register_template), (read_templates):
+               When registering a new template, don't add to "User
+               defined" category before
+               writing to file.  Add to "User defined" category when
+               reading from "~/.glabels"
+               directory instead.  This will allow legacy templates
+               (and manually created
+               templates) to be automatically added to the "user defined"
+               category.
+       * libglabels/xml-template.c:
+       (lgl_xml_template_create_template_node):
+               Fixed typo/bug causing brand to be wrong.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@690
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/xml-template.c
+
+commit ab3ea131f3061e41dd0753167ce5493ecca205ad
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-11-17
+
+    2007-11-16 Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c:
+       * libglabels/db.h:
+               Added return codes to lgl_db_register_template().
+               Added lgl_db_does_template_exist()
+               function.  Automatically create "User defined" category
+               and add to all user
+               registered templates.
+       * libglabels/xml-template.c:
+       * libglabels/xml-template.h:
+               Return number of bytes written from
+               lgl_xml_template_write_templates_to_file() and
+               lgl_xml_template_write_template_to_file().
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/db.sgml:
+       * docs/libglabels/tmpl/xml-template.sgml:
+               Update documentation to reflect above changes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@689
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/db.sgml
+M      glabels2/docs/libglabels/tmpl/xml-template.sgml
+M      glabels2/libglabels/db.c
+M      glabels2/libglabels/db.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml-template.h
+
+commit 1843beacf1f7d4c2954fe21a60d8c95ce8dcec79
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-29
+
+    2007-10-28 Jim Evins  <evins@snaught.com>
+
+       * libglabels/xml-template.c:
+               Remove any leading white space from part #s when parsing
+               old names.
+       * src/mini-preview-pixbuf-cache.c:
+               If name isn't in cache add it.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@688
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/mini-preview-pixbuf-cache.c
+
+commit c4087c54cb13e22815a28921fdcc214b0b5c122c
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-27
+
+    2007-10-26 Jim Evins  <evins@snaught.com>
+
+       * libglabels/Makefile.am:
+       * libglabels/category.c:
+       * libglabels/category.h:
+       * libglabels/db.c:
+       * libglabels/db.h:
+       * libglabels/libglabels-private.h:
+       * libglabels/libglabels.h:
+       * libglabels/paper.c:
+       * libglabels/paper.h:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-template.c:
+               Another pass at screwing with the libglabels API.
+               Moved all
+               database related stuff to db.[ch].
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-docs.sgml:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/category.sgml:
+       * docs/libglabels/tmpl/db.sgml:
+       * docs/libglabels/tmpl/init.sgml:
+       * docs/libglabels/tmpl/libglabels-unused.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/template-construction.sgml:
+       * docs/libglabels/tmpl/template-db.sgml:
+       * docs/libglabels/tmpl/template-misc.sgml:
+       * docs/libglabels/tmpl/template-struct.sgml:
+       * docs/libglabels/tmpl/template.sgml:
+               Updated documentation to reflect above changes to
+               libglabels API.
+       * src/file.c:
+       * src/glabels-batch.c:
+       * src/glabels.c:
+       * src/mini-preview-pixbuf-cache.c:
+       * src/prefs-model.c:
+       * src/print.c:
+       * src/template-designer.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-rotate-label.c:
+       * src/xml-label-04.c:
+       * src/xml-label.c:
+               Reconciled usage with above libglabels API changes.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@687
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-docs.sgml
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/category.sgml
+A      glabels2/docs/libglabels/tmpl/db.sgml
+D      glabels2/docs/libglabels/tmpl/init.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+D      glabels2/docs/libglabels/tmpl/template-construction.sgml
+D      glabels2/docs/libglabels/tmpl/template-db.sgml
+D      glabels2/docs/libglabels/tmpl/template-misc.sgml
+R074   glabels2/docs/libglabels/tmpl/template-struct.sgml
+glabels2/docs/libglabels/tmpl/template.sgml
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/category.c
+M      glabels2/libglabels/category.h
+A      glabels2/libglabels/db.c
+A      glabels2/libglabels/db.h
+D      glabels2/libglabels/init.c
+D      glabels2/libglabels/init.h
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/libglabels.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/file.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/mini-preview-pixbuf-cache.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/print.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+
+commit 4b0f2e892f20e124d2897ac071832b1bc256eb25
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-21
+
+    Removing xv detritus.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@686
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      web/images/.xvpics/button-bg.png
+D      web/images/.xvpics/corner-bl-1.png
+D      web/images/.xvpics/corner-br-1.png
+D      web/images/.xvpics/corner-tl-1.png
+D      web/images/.xvpics/corner-tr-1.png
+D      web/images/.xvpics/glabels-title-140.png
+D      web/images/.xvpics/glabels-title-clean1-140-1.png
+D      web/images/.xvpics/pixel-null.png
+D      web/screenshots/.xvpics/191-screenshot-main-grid-thumb.png
+D      web/screenshots/.xvpics/191-screenshot-main-thumb.png
+D      web/screenshots/.xvpics/191-screenshot-new-thumb.png
+D      web/screenshots/.xvpics/191-screenshot-print-merge-thumb.png
+D      web/screenshots/.xvpics/191-screenshot-print-simple-thumb.png
+D      web/screenshots/.xvpics/192screenshot-tumb.png
+D      web/screenshots/.xvpics/193-screenshot-main-thumb.png
+D      web/screenshots/.xvpics/193-screenshot-new-thumb.png
+D      web/screenshots/.xvpics/193-screenshot-preview-thumb.png
+D      web/screenshots/.xvpics/193-screenshot-print-thumb.png
+D      web/screenshots/.xvpics/glabels-screenshot-1-50%.png
+D      web/screenshots/.xvpics/glabels-screenshot-1-640x480.png
+
+commit a84e23b3e38a8c6fc710759cd3cbf74deedec5d7
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-21
+
+    Initial checkin of website.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@685
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      web/common_php.inc
+A      web/contact/index.php
+A      web/css/glabels.css
+A      web/doc/glabels-2.0.dtd.txt
+A      web/doc/index.php
+A      web/doc/templates-2.0/glabels-template-cd.png
+A      web/doc/templates-2.0/glabels-template-label.png
+A      web/doc/templates-2.0/glabels-template-layout.png
+A      web/doc/templates-2.0/index.php
+A      web/download/index.php
+A      web/faq/index.php
+A      web/faq/q1.3-output.png
+A      web/faq/q1.3-screenshot.png
+A      web/images/.xvpics/button-bg.png
+A      web/images/.xvpics/corner-bl-1.png
+A      web/images/.xvpics/corner-br-1.png
+A      web/images/.xvpics/corner-tl-1.png
+A      web/images/.xvpics/corner-tr-1.png
+A      web/images/.xvpics/glabels-title-140.png
+A      web/images/.xvpics/glabels-title-clean1-140-1.png
+A      web/images/.xvpics/pixel-null.png
+A      web/images/button-bg.png
+A      web/images/corner-bl.png
+A      web/images/corner-br.png
+A      web/images/corner-tl.png
+A      web/images/corner-tr.png
+A      web/images/glabels-title-140.png.good
+A      web/images/pixel-null.png
+A      web/index.php
+A      web/links/index.php
+A      web/news/index.php
+A      web/screenshots/.xvpics/191-screenshot-main-grid-thumb.png
+A      web/screenshots/.xvpics/191-screenshot-main-thumb.png
+A      web/screenshots/.xvpics/191-screenshot-new-thumb.png
+A      web/screenshots/.xvpics/191-screenshot-print-merge-thumb.png
+A      web/screenshots/.xvpics/191-screenshot-print-simple-thumb.png
+A      web/screenshots/.xvpics/192screenshot-tumb.png
+A      web/screenshots/.xvpics/193-screenshot-main-thumb.png
+A      web/screenshots/.xvpics/193-screenshot-new-thumb.png
+A      web/screenshots/.xvpics/193-screenshot-preview-thumb.png
+A      web/screenshots/.xvpics/193-screenshot-print-thumb.png
+A      web/screenshots/.xvpics/glabels-screenshot-1-50%.png
+A      web/screenshots/.xvpics/glabels-screenshot-1-640x480.png
+A      web/screenshots/191-screenshot-main-grid-thumb.png
+A      web/screenshots/191-screenshot-main-grid.png
+A      web/screenshots/191-screenshot-main-thumb.png
+A      web/screenshots/191-screenshot-main.png
+A      web/screenshots/191-screenshot-new-thumb.png
+A      web/screenshots/191-screenshot-new.png
+A      web/screenshots/191-screenshot-print-merge-thumb.png
+A      web/screenshots/191-screenshot-print-merge.png
+A      web/screenshots/191-screenshot-print-simple-thumb.png
+A      web/screenshots/191-screenshot-print-simple.png
+A      web/screenshots/192-screenshot-thumb.png
+A      web/screenshots/192-screenshot.png
+A      web/screenshots/193-screenshot-main-thumb.png
+A      web/screenshots/193-screenshot-main.png
+A      web/screenshots/193-screenshot-new-thumb.png
+A      web/screenshots/193-screenshot-new.png
+A      web/screenshots/193-screenshot-preview-thumb.png
+A      web/screenshots/193-screenshot-preview.png
+A      web/screenshots/193-screenshot-print-thumb.png
+A      web/screenshots/193-screenshot-print.png
+A      web/screenshots/glabels1-screenshot-thumb.jpg
+A      web/screenshots/glabels1-screenshot.jpg
+A      web/screenshots/glabels1-screenshot.png
+A      web/screenshots/index.php
+A      web/source/glabels-0.1.0.tar.gz
+A      web/source/glabels-0.1.1.tar.gz
+A      web/source/glabels-0.1.2.tar.gz
+A      web/source/glabels-0.1.3.tar.gz
+A      web/source/glabels-0.1.4.tar.gz
+A      web/source/glabels-0.1.5.tar.gz
+A      web/source/glabels-0.2.0.tar.gz
+A      web/source/glabels-0.2.1.tar.gz
+A      web/source/glabels-0.2.2.tar.gz
+A      web/source/glabels-0.2.3.tar.gz
+A      web/source/glabels-0.2.4.tar.gz
+A      web/source/glabels-0.3.0.tar.gz
+A      web/source/glabels-0.3.1.tar.gz
+A      web/source/glabels-0.3.2.tar.gz
+A      web/source/glabels-0.3.3.tar.gz
+A      web/source/glabels-0.3.4.tar.gz
+A      web/source/glabels-0.4.0.tar.gz
+A      web/source/glabels-0.4.1.tar.gz
+A      web/source/glabels-0.4.2.tar.gz
+A      web/source/glabels-0.4.3.tar.gz
+A      web/source/glabels-0.4.4.tar.gz
+A      web/source/glabels-0.4.5.tar.gz
+A      web/source/glabels-0.4.6.tar.gz
+A      web/source/glabels-1.89.0.tar.gz
+A      web/source/glabels-1.89.1.tar.gz
+A      web/source/glabels-1.89.2.tar.gz
+A      web/source/glabels-1.90.0.tar.gz
+A      web/source/glabels-1.91.0.tar.gz
+A      web/source/glabels-1.91.1.tar.gz
+A      web/source/glabels-1.92.0.tar.gz
+A      web/source/glabels-1.92.1.tar.gz
+A      web/source/glabels-1.92.2.tar.gz
+A      web/source/glabels-1.92.3.tar.gz
+A      web/source/glabels-1.93.0.tar.gz
+A      web/source/glabels-1.93.1.tar.gz
+A      web/source/glabels-1.93.2.tar.gz
+A      web/source/glabels-1.93.3.tar.gz
+A      web/tango-icons/applications-development.png
+A      web/tango-icons/applications-internet.png
+A      web/tango-icons/dialog-information.png
+A      web/tango-icons/emblem-photos.png
+A      web/tango-icons/help-browser.png
+A      web/tango-icons/internet-news-reader.png
+A      web/tango-icons/package-x-generic.png
+A      web/tango-icons/system-users.png
+
+commit 251a5dee819b418665ab35f0438fd86f43ba7335
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-21
+
+    2007-10-21 Jim Evins  <evins@snaught.com>
+
+       * data/glade/wdgt-media-select.glade:
+       * src/wdgt-media-select.c:
+               Added brand to filter settings.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@684
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/wdgt-media-select.glade
+M      glabels2/src/wdgt-media-select.c
+
+commit 387dce347efdd1ca66fb73d6e44c26e1aa6d93e0
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-21
+
+    2007-10-21 Jim Evins  <evins@snaught.com>
+
+       * data/dtd/glabels-2.2.dtd:
+               Forgot to replace Alias name attribute with brand and
+               part attributes.
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-other-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-other-templates.xml:
+       * data/templates/misc-us-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Replaced all name attributes with brand/part attribute
+               pairs.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@683
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/dtd/glabels-2.2.dtd
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-other-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit 2e4ddae04caaf2ab9a5dea48d2c5961aeaf081a7
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-21
+
+    2007-10-20 Jim Evins  <evins@snaught.com>
+
+       * src/stock-pixmaps/*.png
+               Updated icons to use Tango color palette.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@682
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/stock-pixmaps/stock_align_bottom_16.png
+M      glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
+M      glabels2/src/stock-pixmaps/stock_align_left_16.png
+M      glabels2/src/stock-pixmaps/stock_align_right_16.png
+M      glabels2/src/stock-pixmaps/stock_align_top_16.png
+M      glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
+M      glabels2/src/stock-pixmaps/stock_box_16.png
+M      glabels2/src/stock-pixmaps/stock_box_24.png
+M      glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
+M      glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
+M      glabels2/src/stock-pixmaps/stock_ellipse_16.png
+M      glabels2/src/stock-pixmaps/stock_ellipse_24.png
+M      glabels2/src/stock-pixmaps/stock_image_24.png
+M      glabels2/src/stock-pixmaps/stock_merge_16.png
+M      glabels2/src/stock-pixmaps/stock_merge_24.png
+M      glabels2/src/stock-pixmaps/stock_order_bottom_16.png
+M      glabels2/src/stock-pixmaps/stock_order_top_16.png
+M      glabels2/src/stock-pixmaps/stock_properties_16.png
+M      glabels2/src/stock-pixmaps/stock_properties_24.png
+
+commit a068fff04513122c2b6c7d039aeb9987b19350e2
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-20
+
+    2007-10-20 Jim Evins  <evins@snaught.com>
+
+       * data/dtd/Makefile.am:
+       * data/dtd/glabels-2.0.dtd:
+       * data/dtd/glabels-2.2.dtd:
+               Rename glabels-2.0.dtd to glabels-2.2.dtd.  Added brand
+               and part attributes to
+               template node.
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-template.c:
+       * libglabels/xml.h:
+               Added brand and part attributes to template and alias
+               structures and nodes.
+       * src/file.c:
+       * src/label.c:
+       * src/mini-preview-pixbuf-cache.c:
+       * src/template-designer.c:
+       * src/wdgt-media-select.c:
+               Use modified libglabels API.
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/template-construction.sgml:
+       * docs/libglabels/tmpl/template-db.sgml:
+       * docs/libglabels/tmpl/template-struct.sgml:
+               Update libglabels documentation to reflect above
+               modifications.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@681
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/dtd/Makefile.am
+R098   glabels2/data/dtd/glabels-2.0.dtd
+glabels2/data/dtd/glabels-2.2.dtd
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/template-construction.sgml
+M      glabels2/docs/libglabels/tmpl/template-db.sgml
+M      glabels2/docs/libglabels/tmpl/template-struct.sgml
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.h
+M      glabels2/src/file.c
+M      glabels2/src/label.c
+M      glabels2/src/mini-preview-pixbuf-cache.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 830b1c677df8aef20f24fa11c5dfc3591bf068ee
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-15
+
+    2007-10-14 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/category.sgml:
+       * libglabels/category.c:
+       * libglabels/category.h:
+               Added lgl_category_get_id_list() and
+               lgl_category_free_id_list() to have
+       parity with paper functions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@680
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/category.sgml
+M      glabels2/libglabels/category.c
+M      glabels2/libglabels/category.h
+
+commit 1ec161acb06ebf7440a74f4cf46d927a379980c3
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-13
+
+    2007-10-12 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/category.sgml:
+       * docs/libglabels/tmpl/enums.sgml:
+       * docs/libglabels/tmpl/libglabels-unused.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/template-struct.sgml:
+       * libglabels/init.c:
+       * libglabels/template.c:
+       * libglabels/template.h:
+               Another pass at fleshing out the libglabels documentation.
+       * src/cairo-label-path.c:
+       * src/cairo-markup-path.c:
+       * src/label.c:
+       * src/mini-preview-pixbuf.c:
+       * src/print-op.c:
+       * src/print.c:
+       * src/view.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-rotate-label.c:
+               Removed lgl_template_get_first_frame() from libglabels
+               API and all references.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@679
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/category.sgml
+M      glabels2/docs/libglabels/tmpl/enums.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+M      glabels2/docs/libglabels/tmpl/template-struct.sgml
+M      glabels2/libglabels/init.c
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/src/cairo-label-path.c
+M      glabels2/src/cairo-markup-path.c
+M      glabels2/src/label.c
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/print-op.c
+M      glabels2/src/print.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 7b4ddd14f3013baa2e305a7d8f724ac5bedea6e1
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-12
+
+    2007-10-11 Jim Evins  <evins@snaught.com>
+       * configure.in:
+               Extended checks for deprecated symbols.
+       * libglabels/template.c:
+               Removed g_strcasecmp references, which are deprecated.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@678
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/libglabels/template.c
+
+commit d04a1b6e0b58d4b4e97836c936a38c1a9c8039e0
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-10
+
+    2007-10-09 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c:
+               Create address book if it does not exist.  Also, be more
+               robust about handling
+               error conditions -- don't just assume GError has been set.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@677
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+
+commit bd566146fa954271ebcb3536251c5c521f0a9e87
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-08
+
+    2007-10-08 Jim Evins  <evins@snaught.com>
+
+       * libglabels/template.c:
+       * libglabels/xml-template.c:
+       * src/template-designer.c:
+               Missed some symbols with libglabels API work
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@676
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/template-designer.c
+
+commit 52befabc0173ee7dcd6e4e662cc60e57c7240c98
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-10-02
+
+    2007-10-01 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-docs.sgml:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/category.sgml:
+       * docs/libglabels/tmpl/enums.sgml:
+       * docs/libglabels/tmpl/init.sgml:
+       * docs/libglabels/tmpl/libglabels-unused.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/template-construction.sgml:
+       * docs/libglabels/tmpl/template-db.sgml:
+       * docs/libglabels/tmpl/template-misc.sgml:
+       * docs/libglabels/tmpl/template-struct.sgml:
+       * docs/libglabels/tmpl/template.sgml:
+       * docs/libglabels/tmpl/xml-category.sgml:
+       * docs/libglabels/tmpl/xml-template.sgml:
+       * libglabels/category.h:
+       * libglabels/init.c:
+       * libglabels/libglabels-private.h:
+       * libglabels/paper.h:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-template.h:
+               Basic documentation framework for libglabels updated.
+               This still needs some
+               fleshing out.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@675
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-docs.sgml
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+A      glabels2/docs/libglabels/tmpl/category.sgml
+M      glabels2/docs/libglabels/tmpl/enums.sgml
+M      glabels2/docs/libglabels/tmpl/init.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+A      glabels2/docs/libglabels/tmpl/template-construction.sgml
+A      glabels2/docs/libglabels/tmpl/template-db.sgml
+C050   glabels2/docs/libglabels/tmpl/init.sgml
+glabels2/docs/libglabels/tmpl/template-misc.sgml
+A      glabels2/docs/libglabels/tmpl/template-struct.sgml
+D      glabels2/docs/libglabels/tmpl/template.sgml
+A      glabels2/docs/libglabels/tmpl/xml-category.sgml
+M      glabels2/docs/libglabels/tmpl/xml-template.sgml
+M      glabels2/libglabels/category.h
+M      glabels2/libglabels/init.c
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-template.h
+
+commit c1dd8eca6b4bdb77ba47a74b0bc760cb90ecbf7a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-09-27
+
+    2007-09-27 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+       * docs/libglabels/libglabels-docs.sgml:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/enums.sgml:
+       * docs/libglabels/tmpl/init.sgml:
+       * docs/libglabels/tmpl/libglabels-unused.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/template.sgml:
+       * docs/libglabels/tmpl/xml-paper.sgml:
+       * docs/libglabels/tmpl/xml-template.sgml:
+       * docs/libglabels/tmpl/xml.sgml:
+       * libglabels/Makefile.am:
+       * libglabels/category.c:
+       * libglabels/category.h:
+       * libglabels/enums.h:
+       * libglabels/init.c:
+       * libglabels/init.h:
+       * libglabels/libglabels-private.h:
+       * libglabels/libglabels.h:
+       * libglabels/paper.c:
+       * libglabels/paper.h:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-category.c:
+       * libglabels/xml-category.h:
+       * libglabels/xml-paper.c:
+       * libglabels/xml-paper.h:
+       * libglabels/xml-template.c:
+       * libglabels/xml-template.h:
+       * libglabels/xml.c:
+       * libglabels/xml.h:
+       * src/cairo-label-path.c:
+       * src/cairo-label-path.h:
+       * src/cairo-markup-path.c:
+       * src/cairo-markup-path.h:
+       * src/file.c:
+       * src/glabels-batch.c:
+       * src/glabels.c:
+       * src/label-object.c:
+       * src/label.c:
+       * src/label.h:
+       * src/mini-preview-pixbuf-cache.c:
+       * src/mini-preview-pixbuf.c:
+       * src/mini-preview-pixbuf.h:
+       * src/prefs-dialog.c:
+       * src/prefs-model.c:
+       * src/prefs-model.h:
+       * src/prefs.c:
+       * src/prefs.h:
+       * src/print-op.c:
+       * src/print.c:
+       * src/template-designer.c:
+       * src/view-barcode.c:
+       * src/view-box.c:
+       * src/view-ellipse.c:
+       * src/view-image.c:
+       * src/view-line.c:
+       * src/view.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-mini-preview.h:
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-rotate-label.c:
+       * src/xml-label-04.c:
+       * src/xml-label.c:
+               Major cleanup of libglabels API -- this breaks API
+               compatibility with older
+               development and stable versions -- as far as I know,
+               there are currently
+               no external users of this library yet.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@674
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-docs.sgml
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/enums.sgml
+A      glabels2/docs/libglabels/tmpl/init.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+M      glabels2/docs/libglabels/tmpl/template.sgml
+M      glabels2/docs/libglabels/tmpl/xml-paper.sgml
+M      glabels2/docs/libglabels/tmpl/xml-template.sgml
+M      glabels2/docs/libglabels/tmpl/xml.sgml
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/category.c
+M      glabels2/libglabels/category.h
+M      glabels2/libglabels/enums.h
+A      glabels2/libglabels/init.c
+C066   glabels2/libglabels/libglabels.h        glabels2/libglabels/init.h
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/libglabels.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-category.c
+M      glabels2/libglabels/xml-category.h
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-paper.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml-template.h
+M      glabels2/libglabels/xml.c
+M      glabels2/libglabels/xml.h
+M      glabels2/src/cairo-label-path.c
+M      glabels2/src/cairo-label-path.h
+M      glabels2/src/cairo-markup-path.c
+M      glabels2/src/cairo-markup-path.h
+M      glabels2/src/file.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/mini-preview-pixbuf-cache.c
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/mini-preview-pixbuf.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/print-op.c
+M      glabels2/src/print.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+
+commit be11ca532e497806c00fa59c084b0710668226f8
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-09-15
+
+    2007-09-14 Jim Evins  <evins@snaught.com>
+
+       * src/marshal.list:
+       * src/label.c:
+       * src/label.h:
+       * src/label-object.c:
+       * src/label-object.h:
+       * src/label-barcode.c:
+       * src/label-ellipse.c:
+       * src/view.c:
+       * src/view-object.c:
+       * src/view-barcode.c:
+       * src/view-box.c:
+       * src/view-ellipse.c:
+       * src/view-image.c:
+       * src/view-line.c:
+       * src/view-text.c:
+               Better separation of model from view.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@673
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/marshal.list
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+
+commit 9fe68ac1e34bd2d8067d7ba1b11d199d789e6c43
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-22
+
+    2007-08-21 Jim Evins  <evins@snaught.com>
+
+       * src/print-op.c: (create_custom_widget_cb):
+               Fix problem with force_outline_flag -- don't override
+               with default.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@672
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print-op.c
+
+commit eadd088d7026e249e02e8e72aadc5e24ef2d6669
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-22
+
+    2007-08-21 Jim Evins  <evins@snaught.com>
+
+       * data/dtd/glabels-2.0.dtd:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-template.c:
+       * src/cairo-markup-path.c:
+               Added "Markup-rect" element to template format.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@671
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/dtd/glabels-2.0.dtd
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/cairo-markup-path.c
+
+commit f4b0642bf5404f4000d1a5931e24343fc3c39a53
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-22
+
+    2007-08-21 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Changed version to 2.1.pre5svn.
+       * src/view.c: (draw_markup_layer):
+               Do a stroke for each markup path, otherwise multiple
+               markups
+               get connected.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@670
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/view.c
+
+commit 0add4c0381f437d2ddd4ea70b4af9e496f36fb3f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-18
+
+    2007-08-17 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Bump libglabels revision numbers for 2.1.4 release.
+
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@667
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit c37dbc205f6a08254456ca5e6eabf5ddda0c2e85
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-17
+
+    2007-08-16 Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+               Include subdir iec16022-0.2.1.
+       * NEWS:
+       * configure.in:
+       * glabels.spec.in:
+               Preparation for 2.1.4.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@666
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/NEWS
+M      glabels2/configure.in
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/enums.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+M      glabels2/docs/libglabels/tmpl/libglabels.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+M      glabels2/docs/libglabels/tmpl/template.sgml
+M      glabels2/docs/libglabels/tmpl/xml-paper.sgml
+M      glabels2/docs/libglabels/tmpl/xml-template.sgml
+M      glabels2/docs/libglabels/tmpl/xml.sgml
+M      glabels2/glabels.spec.in
+
+commit 23849ca81b5519a810303a58f5fc9c1786f8183c
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-11
+
+    2007-08-11 Jim Evins  <evins@snaught.com>
+
+       * po/POTFILES.in:
+               Updated file list.
+       * configure.in:
+       * po/eo.po:
+               Added Esperanto translation.  Provided by Antonio C.
+               Codazzi "la Filozofo" <f_sophia@libero.it>.
+       * po/fr.po:
+               Updated French translation. Provided by Claude Paroz
+               <claude@2xlibre.net>.
+       * AUTHORS:
+               Updated to reflect above translations.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@665
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/po/POTFILES.in
+A      glabels2/po/eo.po
+M      glabels2/po/fr.po
+
+commit 41fd335f6a64f47c220865ce5e4ea993f3aed19f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-11
+
+    2007-08-11 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-other-templates.xml:
+       * data/templates/misc-us-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Caught up with backlog of template submissions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@664
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit 4d42d2cdb0267a4a7a702ddea96ad03afe5774ce
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-11
+
+    2007-08-10 Jim Evins  <evins@snaught.com>
+
+       * src/bc-postnet.c: (gl_barcode_postnet_new):
+       * src/bc.c:
+               Added support for Brazilian CEPNet barcodes.  This is
+               simply an
+               instance of the US POSTNET format with 8 digits.
+               Patch supplied
+               by Mário Meyer in bug # 1768792.
+       * AUTHORS:
+               Updated acknowledgments to reflect above patch and
+               recent shuffling
+               of underlying technology.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@663
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc.c
+
+commit c6ae0e48ca2e5c3675d863a3f0ff82c54b952400
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-08-10
+
+    Some updates to TODO.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@662
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+
+commit 71660d95ad493fc253582ef351fdffe5a143ed99
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-13
+
+    2007-05-13 Jim Evins  <evins@snaught.com>
+
+       * src/merge-text.c: (parse_line), (parse_field):
+               Remove leading and trailing spaces from CSV fields,
+               unless quoted.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@661
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-text.c
+
+commit 76cb751459575fbd6a6ccfbd26aac9cb28bcb974
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-10
+
+    2007-05-09 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-bc-page.c:
+       * src/object-editor-data-page.c:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-image-page.c:
+       * src/object-editor-line-page.c:
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-private.h:
+       * src/object-editor-shadow-page.c:
+       * src/object-editor-size-page.c:
+       * src/object-editor-text-page.c:
+       * src/object-editor.c:
+       * src/prefs-dialog.c:
+       * src/template-designer.c:
+       * src/ui-property-bar.c:
+       * src/wdgt-media-select.c:
+               Replaced signal block/unblock pairs with simple flags.
+               This reduces
+               some code clutter, hopefully making it easier to read.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@660
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 63c94320e22a52c443f063092dee5256042eff52
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-05
+
+    2007-05-05 Jim Evins  <evins@snaught.com>
+
+       * src/template-designer.c: (apply_cb):
+               Add new template to mini-preview pixbuf cache.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@659
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/template-designer.c
+
+commit 0e067c75fb73a72914d789d2922a3828523c11a8
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-03
+
+    2007-05-03 Jim Evins  <evins@snaught.com>
+
+       * src/label-image.c: (gl_label_image_init), (draw_object):
+               Scale default pixbuf up, to prevent bluring.
+               Use cairo_fill to
+               render image.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@658
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-image.c
+
+commit d82e7fed684814b37b3306114b66faaaa2336a1b
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-03
+
+    2007-05-02 Jim Evins  <evins@snaught.com>
+
+       * src/view.c: (draw_select_region_layer),
+       (motion_notify_event_cb),
+       (button_release_event_cb):
+               Removed attempt at rendering optimization by clipping
+               the updates
+               to areas affected -- this actually seemed to hurt update
+               performance.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@657
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view.c
+
+commit 6c00fe9f6e32f702f5887d6145f8b88e2e09de3d
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-01
+
+    2007-04-30 Jim Evins  <evins@snaught.com>
+
+       * src/color.h:
+       * src/color.c: (gl_color_shadow), (gl_color_node_new_default),
+       (gl_color_node_equal), (gl_color_node_expand):
+       * src/label-barcode.c: (draw_object):
+       * src/label-box.c: (draw_object), (draw_shadow):
+       * src/label-ellipse.c: (draw_object), (draw_shadow):
+       * src/label-line.c: (draw_object), (draw_shadow):
+       * src/label-text.c: (draw_object), (draw_shadow):
+       * src/wdgt-mini-preview.c: (draw_shadow), (draw_labels):
+       * src/wdgt-rotate-label.c: (drawingarea_update):
+               Some cleanup to color related code.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@656
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-line.c
+M      glabels2/src/label-text.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 4ca379add847194fa1375fe127e9800367f655e1
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-05-01
+
+    2007-04-30 Jim Evins  <evins@snaught.com>
+
+       * src/label.h:
+               Added glLabelRegion structure type.
+       * src/label-object.c: (gl_label_object_get_extent):
+       * src/label-object.h:
+               Modified gl_label_object_get_extent() to fill in a
+               glLabelRegion struct.
+       * src/view.h:
+       * src/view.c: (gl_view_update_region), (draw_select_region_layer),
+       (gl_view_select_region), (gl_view_align_selection_left),
+       (gl_view_align_selection_right),
+       (gl_view_align_selection_hcenter),
+       (gl_view_align_selection_top), (gl_view_align_selection_bottom),
+       (gl_view_align_selection_vcenter),
+       (gl_view_center_selection_horiz), (gl_view_center_selection_vert),
+       (gl_view_move_selection), (gl_view_can_selection_text),
+       (motion_notify_event_cb), (button_press_event_cb),
+       (button_release_event_cb):
+               - Reconcile with new gl_label_object_get_extent() API.
+               - Use glLabelRegion for view->select_region.
+               - Added gl_view_update_region() to clip updates to region.
+               - Use gl_view_update_region() during manipulation of
+               view->select_region.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@655
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit b6893fe7ca71c477320ba676d3805e8561d393ad
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-27
+
+    2007-04-26 Jim Evins  <evins@snaught.com>
+
+       * src/mini-preview-pixbuf.c: (draw_paper), (draw_label_outlines),
+       (draw_label_outline):
+       * src/print.c: (print_crop_marks), (draw_outline):
+       * src/view-object.c: (gl_view_object_draw_handles):
+       * src/view.c: (draw_bg_layer), (draw_grid_layer),
+       (draw_markup_layer), (draw_fg_layer), (draw_select_region_layer):
+       * src/wdgt-mini-preview.c: (draw_paper), (draw_labels):
+       * src/wdgt-rotate-label.c: (drawingarea_update):
+               Added defines for various magic numbers.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@654
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/print.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 9f454a0a6e7c34a33cbe829be4cfd5374a4cde9a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-26
+
+    2007-04-25 Jim Evins  <evins@snaught.com>
+
+       * src/label-text.c: (get_size), (draw_object), (draw_shadow):
+               Scale text down.  Cairo seems to render text too large.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@653
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-text.c
+
+commit 06ddcbb495e31a450b36bd7a90b7760d5ca9553a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-25
+
+    2007-04-25 Jim Evins  <evins@snaught.com>
+
+       * src/view.h:
+       * src/view.c: (gl_view_update), (expose_cb),
+       (motion_notify_event_cb), (button_press_event_cb),
+       (button_release_event_cb):
+               - Try not to let updates get backed up.
+               - Grab pointer when doing any drag operations.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@652
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 50418d4af1223ea832c83b09ac0e67027f97fd78
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-12
+
+    2007-04-11 Jim Evins  <evins@snaught.com>
+
+       * src/cairo-label-path.c: (gl_cairo_label_path),
+       (gl_cairo_rect_label_path), (gl_cairo_round_label_path),
+       (gl_cairo_cd_label_path):
+       * src/cairo-label-path.h:
+       * src/mini-preview-pixbuf.c: (draw_paper), (draw_label_outlines),
+       (draw_label_outline):
+       * src/print.c: (draw_outline), (clip_to_outline):
+       * src/view.c: (draw_bg_layer), (draw_fg_layer):
+       * src/wdgt-mini-preview.c: (draw_labels):
+       * src/wdgt-rotate-label.c: (drawingarea_update):
+               Modified to universally use gl_cairo_label_path() to
+               create paths
+               for labels.  Added shadow to mini preview in rotate
+               widget.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@651
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/cairo-label-path.c
+M      glabels2/src/cairo-label-path.h
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/print.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 964caeca001e6f6b7c26d5beb6dc5cc34b7debba
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-10
+
+    2007-04-10 Jim Evins  <evins@snaught.com>
+
+       * libglabels/template.h:
+       * libglabels/template.c: (gl_template_get_name_list_unique),
+       (gl_template_get_name_list_all), (gl_template_from_name):
+               Modified libglabels to allow you to get a list of all
+               template names
+               including all aliases or just a list of primary names
+               of each unique
+               template.
+       * src/Makefile.am:
+       * src/file.c: (gl_file_properties):
+       * src/glabels.c: (main):
+       * src/mini-preview-pixbuf-cache.h:
+       * src/mini-preview-pixbuf-cache.c:
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
+       (filter_changed_cb), (load_list):
+               Added mini-preview pixbuf cache, so that only one
+               mini-preview is
+               needed for a unique template and gets reused for all
+               aliases.  These
+               pixbufs will also live for the life of the program so
+               they are not
+               rebuilt everytime a new label dialog is invoked.
+       * src/mini-preview-pixbuf.c: (draw_paper),
+       (draw_rect_label_outline), (draw_round_label_outline),
+       (draw_cd_label_outline):
+               Removed some comment artifacts.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@650
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+M      glabels2/src/glabels.c
+A      glabels2/src/mini-preview-pixbuf-cache.c
+A      glabels2/src/mini-preview-pixbuf-cache.h
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/wdgt-media-select.c
+
+commit b84b6dc42d8058bf402d94381a1c04f000b1eaa5
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-05
+
+    2007-04-04 Jim Evins  <evins@snaught.com>
+
+       * src/mini-preview-pixbuf.c: (gl_mini_preview_pixbuf_new),
+       (draw_paper), (draw_label_outlines), (draw_rect_label_outline),
+       (draw_round_label_outline), (draw_cd_label_outline):
+       * src/wdgt-media-select.c: (load_list):
+       * src/wdgt-rotate-label.c: (draw_cd_label_outline):
+               Cosmetic enhancments to mini previews.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@649
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/mini-preview-pixbuf.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 1be928597fdd42d641cc0a04d772e82254e54483
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-05
+
+    2007-04-04 Jim Evins  <evins@snaught.com>
+
+       * src/ui-property-bar.c: (gl_ui_property_bar_finalize),
+       (gl_ui_property_bar_construct):
+               Save copy of GladeXML tree so that we don't lose tooltips.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@648
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-property-bar.c
+
+commit 9b65ed5d46a7f5dc3c4e8f2aedc0e770d98652a1
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-03
+
+    2007-04-02 Jim Evins  <evins@snaught.com>
+
+       * src/merge-properties-dialog.c:
+       * src/new-label-dialog.c:
+       * src/object-editor.c:
+       * src/prefs-dialog.c:
+       * src/print-op.c:
+       * src/template-designer.c:
+       * src/ui-property-bar.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-rotate-label.c:
+               Fixed several memory leaks.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@647
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/print-op.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 9ee204c455957fe69435d198bfe5dea1a76c4dcf
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-04-02
+
+    2007-04-01 Jim Evins  <evins@snaught.com>
+
+       * src/label-text.c: (gl_label_text_init), (copy),
+       (gl_label_text_set_lines), (buffer_changed_cb), (get_size),
+       (set_font_family), (set_font_size), (set_font_weight),
+       (set_font_italic_flag), (set_text_alignment),
+       (set_text_line_spacing):
+               Cache object size, so that expensive extent calculations
+               are only done
+               when needed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@646
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-text.c
+
+commit f1f7eedc35c3d9b79d20df87a3bd9fa04d5f4801
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-31
+
+    2007-03-30 Jim Evins  <evins@snaught.com>
+
+       * src/prefs-model.c: (gl_prefs_model_load_settings):
+               Default to an unlimited list of recent documents, since
+               this parameter
+               seems to be pre-filter anyway.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@645
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/prefs-model.c
+
+commit 2bc6be422a9c43e13323282eac6561a1dc0a040a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-31
+
+    2007-03-30 Jim Evins  <evins@snaught.com>
+
+       * src/label-box.c: (draw_shadow):
+       * src/label-ellipse.c: (draw_shadow):
+               Added missing shadow fill.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@644
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+
+commit 509bffa75a8b51d08dfd2103c309492c73572fa1
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-29
+
+    2007-03-28 Jim Evins  <evins@snaught.com>
+
+       * src/ui-commands.c: (gl_ui_cmd_file_print):
+               Unreferencing the print operation sometimes crashes.
+               Just don't do it
+               right now.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@643
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-commands.c
+
+commit 98764f06e25c92bfbd923aaa2b0733ac5a98b888
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-29
+
+    2007-03-28 Jim Evins  <evins@snaught.com>
+
+       * src/print-op.c: (gl_print_op_construct),
+       (gl_print_op_get_settings), (gl_print_op_set_settings),
+       (gl_print_op_free_settings), (create_custom_widget_cb):
+       * src/print-op.h:
+       * src/ui-commands.c: (gl_ui_cmd_file_print):
+       * src/window.c: (gl_window_init):
+       * src/window.h:
+               Save print settings and custom settings between print
+               operations
+               on the same window.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@642
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print-op.c
+M      glabels2/src/print-op.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit a25478bf5ee5750eace1a8e62017dac72ecf908d
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-25
+
+    2007-03-24 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page),
+       (gl_object_editor_set_image), (img_selection_changed_cb):
+               Workaround for GtkFileChooserButton bug # 327243.
+               This the root
+               cause for gLabels bug # 1192884.  I have actually observed
+               3 delayed
+               "selection-changed" signals -- the first 2 return NULL --
+               this is
+               what caused the image to reset to the default followed
+               by setting
+               it back to the original image, trying to fit it into a
+               new bounding
+               box.  This sequence of events is much more evident with
+               the new
+               cairo rendering.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@641
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-image-page.c
+
+commit 80da57dd539f5b6d5118703b7b005740561b645a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-03-24
+
+    2007-03-23 Jim Evins  <evins@snaught.com>
+
+       Merged all changes from experimental cairo branch to trunk.
+       Trunk no longer depends on libgnomecanvas or libgnomeprint[ui].
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@639
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/base64.c
+M      glabels2/src/bc-iec16022.c
+A      glabels2/src/cairo-ellipse-path.c
+C070   glabels2/src/xml-label-191.h    glabels2/src/cairo-ellipse-path.h
+A      glabels2/src/cairo-label-path.c
+C069   glabels2/src/xml-label-191.h    glabels2/src/cairo-label-path.h
+A      glabels2/src/cairo-markup-path.c
+R067   glabels2/src/xml-label-191.h    glabels2/src/cairo-markup-path.h
+D      glabels2/src/canvas-hacktext.c
+D      glabels2/src/canvas-hacktext.h
+M      glabels2/src/color.c
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-image.c
+M      glabels2/src/label-line.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge.c
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/pixbuf-cache.c
+M      glabels2/src/print-op.c
+M      glabels2/src/print.c
+M      glabels2/src/recent.c
+M      glabels2/src/stock.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/text-node.c
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-barcode.h
+M      glabels2/src/view-box.c
+M      glabels2/src/view-box.h
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-ellipse.h
+D      glabels2/src/view-highlight.c
+D      glabels2/src/view-highlight.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-image.h
+M      glabels2/src/view-line.c
+M      glabels2/src/view-line.h
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view-text.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/window.c
+M      glabels2/src/xml-label-04.c
+D      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit d105b1574ae720348f30ca814fb494e4d44fd344
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-18
+
+    2007-02-18 Jim Evins  <evins@snaught.com>
+
+       * src/bc.h:
+               GNOME_FONT_BOOK changed to PANGO_WEIGHT_NORMAL.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@615
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/bc.h
+
+commit 70d3926fcf186c46f553e1ea58a1072a9ab4c68f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-14
+
+    2007-02-14 Jim Evins  <evins@snaught.com>
+
+       * src/base64.c:
+       * src/base64.h:
+       * src/bc-gnubarcode.c:
+       * src/bc-gnubarcode.h:
+       * src/bc-postnet.c:
+       * src/bc-postnet.h:
+       * src/bc.c:
+       * src/bc.h:
+       * src/canvas-hacktext.c:
+       * src/canvas-hacktext.h:
+       * src/debug.c:
+       * src/debug.h:
+       * src/file.c:
+       * src/file.h:
+       * src/glabels.c:
+       * src/hig.h:
+       * src/label-barcode.c:
+       * src/label-barcode.h:
+       * src/label-box.c:
+       * src/label-box.h:
+       * src/label-ellipse.c:
+       * src/label-ellipse.h:
+       * src/label-image.c:
+       * src/label-image.h:
+       * src/label-line.c:
+       * src/label-line.h:
+       * src/label-object.c:
+       * src/label-object.h:
+       * src/label-text.c:
+       * src/label-text.h:
+       * src/label.c:
+       * src/label.h:
+       * src/merge-evolution.c:
+       * src/merge-evolution.h:
+       * src/merge-init.c:
+       * src/merge-init.h:
+       * src/merge-properties-dialog.c:
+       * src/merge-properties-dialog.h:
+       * src/merge-text.c:
+       * src/merge-text.h:
+       * src/merge-vcard.c:
+       * src/merge-vcard.h:
+       * src/merge.c:
+       * src/merge.h:
+       * src/mini-preview-pixbuf.h:
+       * src/new-label-dialog.c:
+       * src/new-label-dialog.h:
+       * src/object-editor-bc-page.c:
+       * src/object-editor-data-page.c:
+       * src/object-editor-edit-page.c:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-image-page.c:
+       * src/object-editor-line-page.c:
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-private.h:
+       * src/object-editor-size-page.c:
+       * src/object-editor-text-page.c:
+       * src/object-editor.c:
+       * src/object-editor.h:
+       * src/pixbuf-cache.c:
+       * src/pixbuf-cache.h:
+       * src/prefs-dialog.c:
+       * src/prefs-dialog.h:
+       * src/prefs-model.c:
+       * src/prefs-model.h:
+       * src/prefs.c:
+       * src/prefs.h:
+       * src/print-op.c:
+       * src/stock.c:
+       * src/stock.h:
+       * src/template-designer.c:
+       * src/text-node.c:
+       * src/text-node.h:
+       * src/ui-commands.c:
+       * src/ui-commands.h:
+       * src/ui-property-bar.c:
+       * src/ui-property-bar.h:
+       * src/ui-sidebar.c:
+       * src/ui-sidebar.h:
+       * src/ui-util.c:
+       * src/ui-util.h:
+       * src/ui.c:
+       * src/ui.h:
+       * src/util.c:
+       * src/util.h:
+       * src/view-barcode.c:
+       * src/view-barcode.h:
+       * src/view-box.c:
+       * src/view-box.h:
+       * src/view-ellipse.c:
+       * src/view-ellipse.h:
+       * src/view-highlight.c:
+       * src/view-highlight.h:
+       * src/view-image.c:
+       * src/view-image.h:
+       * src/view-line.c:
+       * src/view-line.h:
+       * src/view-object.c:
+       * src/view-object.h:
+       * src/view-text.c:
+       * src/view-text.h:
+       * src/view.c:
+       * src/view.h:
+       * src/wdgt-chain-button.c:
+       * src/wdgt-chain-button.h:
+       * src/wdgt-media-select.c:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-print-merge.h:
+       * src/wdgt-rotate-label.c:
+       * src/window.h:
+       * src/xml-label-04.c:
+       * src/xml-label-04.h:
+       * src/xml-label-191.c:
+       * src/xml-label-191.h:
+       * src/xml-label.c:
+       * src/xml-label.h:
+
+       Assorted superficial cleanup.  Including:
+       - Use G_DEFINE_TYPE for all objects.
+       - Reconcile style of all class initializer functions
+       - Reconcile style of all finalize functions
+       - Add emacs mode line to all source files
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@614
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/base64.c
+M      glabels2/src/base64.h
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-gnubarcode.h
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc-postnet.h
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/canvas-hacktext.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels.c
+M      glabels2/src/hig.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/merge-evolution.h
+M      glabels2/src/merge-init.c
+M      glabels2/src/merge-init.h
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge-text.h
+M      glabels2/src/merge-vcard.c
+M      glabels2/src/merge-vcard.h
+M      glabels2/src/merge.c
+M      glabels2/src/merge.h
+M      glabels2/src/mini-preview-pixbuf.h
+M      glabels2/src/new-label-dialog.c
+M      glabels2/src/new-label-dialog.h
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/pixbuf-cache.c
+M      glabels2/src/pixbuf-cache.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/print-op.c
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/text-node.c
+M      glabels2/src/text-node.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-commands.h
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-sidebar.h
+M      glabels2/src/ui-util.c
+M      glabels2/src/ui-util.h
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-barcode.h
+M      glabels2/src/view-box.c
+M      glabels2/src/view-box.h
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-ellipse.h
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-highlight.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-image.h
+M      glabels2/src/view-line.c
+M      glabels2/src/view-line.h
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view-text.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-chain-button.c
+M      glabels2/src/wdgt-chain-button.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-04.h
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label-191.h
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-label.h
+
+commit 665381a70f6353b094d0b1a1c4307b70a6e2b1be
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-07
+
+    2007-02-06 Jim Evins  <evins@snaught.com>
+
+    Assorted cleanup and removal of deprecated items.
+
+       * src/splash.c:
+       * src/splash.h:
+       * src/Makefile.am:
+               Removed annoying splash screen.
+       * src/glabels-batch.c: (main):
+       * src/glabels.c: (main):
+               Converted from popt to GOption.
+       * src/object-editor-shadow-page.c:
+       (gl_object_editor_set_shadow_state):
+               Removed deprecated method on GtkToggleButton.
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+               Removed dependency on libgnomui/qnome-url.h.
+       * src/template-designer.c:
+               Removed dependency on libgnome/gnome-program.h.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@613
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/object-editor-shadow-page.c
+D      glabels2/src/splash.c
+D      glabels2/src/splash.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-commands.c
+
+commit 0e1789c306720da62df98918ddd2b9d724f446dd
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-05
+
+    2007-02-04 Jim Evins  <evins@snaught.com>
+
+       * src/color.c:
+       * src/color.h:
+       * src/prefs-model.c:
+       * src/print.c: (draw_text_object):
+       * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_construct):
+               Removed GnomeCanvas artifacts from color.[ch] and
+               related modules.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@612
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/print.c
+M      glabels2/src/wdgt-mini-preview.c
+
+commit 8fba57d0f464c7fc6c08145ce8dc6f70eb693ac9
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-05
+
+    2007-02-04 Jim Evins  <evins@snaught.com>
+
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-mini-preview.h:
+               Ported widget from GnomeCanvas to Cairo.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@611
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+
+commit be3e30869fa93195007e75dc2646887490a8776a
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-02-03
+
+    2007-02-03 Jim Evins  <evins@snaught.com>
+
+       * data/glade/template-designer.glade:
+       * src/template-designer.c:
+       * src/template-designer.h:
+               Ported GnomeDruid to GtkAssistant.  Since libglade
+               does not
+               yet support the GtkAssistant and we derive directly from
+               the Assistant, the pages are layed out in a GtkNotebook in
+               the glade description -- we then append each page to the
+               assistant.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@610
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/template-designer.glade
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.h
+
+commit ab68c667d1b265e30fb49264231c48158904922f
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-26
+
+    2007-01-25 Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+               Added dummy page to notebook, to prevent shadow page from
+               becoming the default current page at creation.
+       * src/view-box.c: (construct_properties_editor):
+       * src/view-ellipse.c: (construct_properties_editor):
+       * src/view-line.c: (construct_properties_editor):
+       * src/view-text.c: (construct_properties_editor):
+               Reconciled order of params.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@609
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+
+commit ac594875e6e9bd1725ce7c1a2035b2b14ae4cf83
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-20
+
+    2007-01-19 Jim Evins  <evins@snaught.com>
+
+       * src/label-barcode.h:
+       * src/label-object.c: (gl_label_object_set_font_weight),
+       (gl_label_object_set_text_alignment),
+       (gl_label_object_get_font_weight),
+       (gl_label_object_get_text_alignment):
+       * src/label-object.h:
+       * src/label-text.c: (gl_label_text_instance_init), (copy),
+       (get_size), (set_font_family), (set_font_weight),
+       (set_text_alignment), (get_font_weight), (get_text_alignment):
+       * src/label-text.h:
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_font_family),
+       (gl_object_editor_set_font_weight),
+       (gl_object_editor_get_font_weight),
+       (gl_object_editor_set_text_alignment),
+       (gl_object_editor_get_text_alignment),
+       (gl_object_editor_set_text_color):
+       * src/object-editor.h:
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs), (update_prefs_from_object_page):
+       * src/prefs-model.c: (gl_prefs_model_save_settings),
+       (gl_prefs_model_load_settings):
+       * src/prefs-model.h:
+       * src/print.c: (draw_text_object):
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties), (update_text_properties),
+       (font_bold_toggled_cb), (text_align_toggled_cb):
+       * src/ui-sidebar.c:
+       * src/util.c: (gl_util_align_to_string),
+       (gl_util_string_to_align),
+       (gl_util_weight_to_string), (gl_util_string_to_weight),
+       (gl_util_get_font_family_list), (gl_util_font_family_list_free):
+       * src/util.h:
+       * src/view-text.c: (update_object_from_editor_cb),
+       (update_editor_from_object_cb), (draw_hacktext), (draw_cursor):
+       * src/view.c: (gl_view_set_selection_text_alignment),
+       (gl_view_set_default_text_alignment),
+       (gl_view_get_default_text_alignment):
+       * src/view.h:
+       * src/xml-label-04.c: (xml04_parse_text_props):
+       * src/xml-label-191.c: (xml191_parse_text_props):
+       * src/xml-label.c: (xml_parse_object_text),
+       (xml_parse_toplevel_span), (xml_create_object_text),
+       (xml_create_toplevel_span):
+               Converted all model internals to Pango.  GnomeFont
+               remains in
+       view until GnomeCanvas can be replaced with a cairo-based canvas.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@608
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/print.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 151648533ca01ebdc95b8c28bb261ab8f4cdce50
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-17
+
+    2007-01-17 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/hig.c:
+               Deleted hig.c.
+       * src/hig.h:
+       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type),
+       (gl_wdgt_print_copies_construct):
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type),
+       (gl_wdgt_print_merge_construct):
+       * src/wdgt-print-merge.h:
+               Removed all remaining HIG wrapper widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@607
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+D      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+
+commit f628d64bc327e037fa58c8c11f7919b62b182cb6
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-17
+
+    2007-01-16 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/print-dialog.c:
+       * src/print-dialog.h:
+       * src/print-op.c:
+       * src/print-op.h:
+       * src/template-designer.c: (print_test_cb):
+       * src/ui-commands.c: (gl_ui_cmd_file_print):
+       * src/print.c:
+               Renamed PrintDialog to PrintOp.  Added constructor
+               for batch
+               printing.
+       * src/glabels-batch.c: (main):
+               Converted to use new PrintOp object for printing.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@606
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+M      glabels2/src/glabels-batch.c
+D      glabels2/src/print-dialog.c
+D      glabels2/src/print-dialog.h
+A      glabels2/src/print-op.c
+A      glabels2/src/print-op.h
+M      glabels2/src/print.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-commands.c
+
+commit 4c211331406f4acb734bbc70bf9fc713e0afb196
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-16
+
+    2007-01-15 Jim Evins  <evins@snaught.com>
+
+       * data/glade/Makefile.am:
+       * data/glade/print-custom-widget.glade:
+       * src/print-dialog.c:
+       * src/print-dialog.h:
+       * src/print.c:
+       * src/print.h:
+       * src/template-designer.c: (print_test_cb):
+       * src/ui-commands.c: (gl_ui_cmd_file_print):
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_copies):
+       * src/wdgt-print-merge.h:
+       * src/window.c: (gl_window_init):
+       * src/window.h:
+               Initial conversion to GtkPrintOperation.
+               Still to do:
+                - Remove font and other libgnomeprint[ui] from elsewhere
+                - Add batch initialization of print operation
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@605
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/Makefile.am
+A      glabels2/data/glade/print-custom-widget.glade
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-commands.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit eb45e319f0ff83b292a56474ff2c1ba5137f51f5
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-09
+
+    2007-01-08 Jim Evins  <evins@snaught.com>
+       * configure.in:
+               Updated dependencies.  Set version to 2.1.pre4cvs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@604
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit f36c9e446e0640cbf78b76117d3fa254181b7882
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-04
+
+    2007-01-03 Jim Evins  <evins@snaught.com>
+
+       * src/recent-files/*
+               Removed EggRecent stuff.
+       * configure.in:
+       * src/Makefile.am:
+       * src/file.c:
+       * src/recent.c:
+       * src/recent.h:
+       * src/ui-commands.c:
+       * src/ui-commands.h:
+       * src/ui.c:
+               Ported from EggRecent to GtkRecentManager.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@603
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+D      glabels2/src/recent-files/Makefile.am
+D      glabels2/src/recent-files/egg-recent-item.c
+D      glabels2/src/recent-files/egg-recent-item.h
+D      glabels2/src/recent-files/egg-recent-model.c
+D      glabels2/src/recent-files/egg-recent-model.h
+D      glabels2/src/recent-files/egg-recent-util.c
+D      glabels2/src/recent-files/egg-recent-util.h
+D      glabels2/src/recent-files/egg-recent-view-uimanager.c
+D      glabels2/src/recent-files/egg-recent-view-uimanager.h
+D      glabels2/src/recent-files/egg-recent-view.c
+D      glabels2/src/recent-files/egg-recent-view.h
+D      glabels2/src/recent-files/egg-recent.h
+D      glabels2/src/recent-files/update-from-egg.sh
+M      glabels2/src/recent.c
+M      glabels2/src/recent.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui-commands.h
+M      glabels2/src/ui.c
+
+commit 8d177160daf7c299b803331e03b3b429070cb1eb
+Author: Jim Evins <evins@snaught.com>
+Date:  2007-01-03
+
+    2007-01-02 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * iec16022-0.2.1/BUGS:
+       * iec16022-0.2.1/CHANGELOG:
+       * iec16022-0.2.1/CREDITS:
+       * iec16022-0.2.1/INSTALL:
+       * iec16022-0.2.1/LICENSE:
+       * iec16022-0.2.1/Makefile.am:
+       * iec16022-0.2.1/Makefile.dist:
+       * iec16022-0.2.1/README:
+       * iec16022-0.2.1/README.glabels:
+       * iec16022-0.2.1/TODO:
+       * iec16022-0.2.1/iec16022.1:
+       * iec16022-0.2.1/iec16022.c:
+       * iec16022-0.2.1/iec16022ecc200.c:
+       * iec16022-0.2.1/iec16022ecc200.h:
+       * iec16022-0.2.1/image.c:
+       * iec16022-0.2.1/image.h:
+       * iec16022-0.2.1/reedsol.c:
+       * iec16022-0.2.1/reedsol.h:
+       * iec16022-0.2.1/test/testsuite-example.bin:
+       * iec16022-0.2.1/test/testsuite-example.eps:
+       * iec16022-0.2.1/test/testsuite-example.hex:
+       * iec16022-0.2.1/test/testsuite-example.png:
+       * iec16022-0.2.1/test/testsuite-example.text:
+       * iec16022-0.2.1/test/testsuite.sh:
+               Include modified copy of iec16022-0.2.1 to provide
+               encoding
+               support for datamatrix 2D barcodes.
+       * src/Makefile.am:
+       * src/bc-iec16022.c:
+       * src/bc-iec16022.h:
+       * src/bc.c:
+               Added initial datamatrix 2D barcode backend to barcode
+               code.
+       * INSTALL:
+       * gtk-doc.make:
+               Automatic updates to later versions of these files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@602
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/INSTALL
+M      glabels2/configure.in
+M      glabels2/gtk-doc.make
+A      glabels2/iec16022-0.2.1/BUGS
+A      glabels2/iec16022-0.2.1/CHANGELOG
+A      glabels2/iec16022-0.2.1/CREDITS
+A      glabels2/iec16022-0.2.1/INSTALL
+A      glabels2/iec16022-0.2.1/LICENSE
+A      glabels2/iec16022-0.2.1/Makefile.am
+A      glabels2/iec16022-0.2.1/Makefile.dist
+A      glabels2/iec16022-0.2.1/README
+A      glabels2/iec16022-0.2.1/README.glabels
+A      glabels2/iec16022-0.2.1/TODO
+A      glabels2/iec16022-0.2.1/iec16022.1
+A      glabels2/iec16022-0.2.1/iec16022.c
+A      glabels2/iec16022-0.2.1/iec16022ecc200.c
+A      glabels2/iec16022-0.2.1/iec16022ecc200.h
+A      glabels2/iec16022-0.2.1/image.c
+A      glabels2/iec16022-0.2.1/image.h
+A      glabels2/iec16022-0.2.1/reedsol.c
+A      glabels2/iec16022-0.2.1/reedsol.h
+A      glabels2/iec16022-0.2.1/test/testsuite-example.bin
+A      glabels2/iec16022-0.2.1/test/testsuite-example.eps
+A      glabels2/iec16022-0.2.1/test/testsuite-example.hex
+A      glabels2/iec16022-0.2.1/test/testsuite-example.png
+A      glabels2/iec16022-0.2.1/test/testsuite-example.text
+A      glabels2/iec16022-0.2.1/test/testsuite.sh
+M      glabels2/src/Makefile.am
+A      glabels2/src/bc-iec16022.c
+A      glabels2/src/bc-iec16022.h
+M      glabels2/src/bc.c
+
+commit 468fd00dc4fcec77d28301274de4c50ebd4afaeb
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-11-28
+
+    2006-11-28 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/categories.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-us-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               More categorization.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@597
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/categories.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit 0348e755ccc6e81d040771bfbdff6ccd081908ff
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-09-13
+
+    2006-09-12 Jim Evins  <evins@snaught.com>
+
+       * data/dtd/glabels-2.0.dtd:
+       * data/templates/Makefile.am:
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-other-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/categories.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-other-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+       * data/glade/Makefile.am:
+       * data/glade/new-label-dialog.glade:
+       * data/glade/wdgt-media-select.glade:
+       * data/glade/wdgt-rotate-label.glade:
+       * libglabels/Makefile.am:
+       * libglabels/category.c:
+       * libglabels/category.h:
+       * libglabels/libglabels.h:
+       * libglabels/paper.c:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-category.c:
+       * libglabels/xml-category.h:
+       * libglabels/xml-template.c:
+               Added support for category meta data.
+       * src/Makefile.am:
+       * src/file.c:
+       * src/mini-preview-pixbuf.c:
+       * src/mini-preview-pixbuf.h:
+       * src/new-label-dialog.c:
+       * src/new-label-dialog.h:
+       * src/wdgt-media-select.c:
+       * src/wdgt-media-select.h:
+       * src/wdgt-rotate-label.c:
+       * src/wdgt-rotate-label.h:
+               New "new label" dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@596
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/dtd/glabels-2.0.dtd
+M      glabels2/data/glade/Makefile.am
+A      glabels2/data/glade/new-label-dialog.glade
+A      glabels2/data/glade/wdgt-media-select.glade
+A      glabels2/data/glade/wdgt-rotate-label.glade
+M      glabels2/data/templates/Makefile.am
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-other-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+A      glabels2/data/templates/categories.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+M      glabels2/gtk-doc.make
+M      glabels2/libglabels/Makefile.am
+A      glabels2/libglabels/category.c
+A      glabels2/libglabels/category.h
+M      glabels2/libglabels/libglabels.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+A      glabels2/libglabels/xml-category.c
+C059   glabels2/libglabels/libglabels.h
+glabels2/libglabels/xml-category.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+A      glabels2/src/mini-preview-pixbuf.c
+A      glabels2/src/mini-preview-pixbuf.h
+A      glabels2/src/new-label-dialog.c
+A      glabels2/src/new-label-dialog.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+
+commit 1667e133aa695fd8dd6a4475267e030699013804
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-05-27
+
+    2006-05-27 Jim Evins  <evins@snaught.com>
+
+       * NEWS:
+       * autogen.sh:
+       * configure.in:
+               Preparation for 2.1.3.
+       * acinclude.m4:
+       * omf.make:
+       * xmldocs.make:
+               Removed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@592
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+D      glabels2/acinclude.m4
+M      glabels2/autogen.sh
+M      glabels2/configure.in
+D      glabels2/omf.make
+D      glabels2/xmldocs.make
+
+commit 1089d9b2f104ef8d172aa3304ff7e90c88b2d68c
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-05-23
+
+    2006-05-22 Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (draw_barcode_object):
+               Don't print "Invalid barcode data" if data field is empty.
+               Patch provided
+               by Darren Warner <warnerd@users.sourceforge.net>.
+               Fixes Bug #1479839.
+       * AUTHORS:
+               Added acknowledgment for above patch.
+       * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
+       * src/bc-postnet.c: (postnet_code):
+               Removed "Invalid barcode data" warnings from stderr.
+       * src/view-barcode.c: (draw_barcode):
+               Draw box around barcode extent if data empty or invalid.
+               Center a
+               message whether the data is empty or invalid in box.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@591
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+
+commit ba2b25fb9ca6a4182e5503df8da832a3db0493d8
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-05-22
+
+    2006-05-22 Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (draw_text_object):
+               Check shadow state when printing text.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@590
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+
+commit e846c1338e1a2608bf23eaceac97bb1f9a0e850e
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-05-20
+
+    2006-05-20 Jim Evins  <evins@snaught.com>
+
+       * src/ui-commands.c: (gl_ui_cmd_view_grid_toggle),
+       (gl_ui_cmd_view_markup_toggle):
+               Fixed crash when grid or markup have been toggled
+               off during
+               a previous session.  Bug #1434324.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@589
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-commands.c
+
+commit 888d81773c18187b4a66047121b9c75bdfdabde1
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-04-06
+
+    2006-04-05 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+               Fixed potential crash when freeing empty key list.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@588
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor.c
+
+commit aebddd9d6b63a0a09277fa0d5d57f29765ce3923
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-03-12
+
+    2006-03-11 Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (draw_text_object):
+       * src/view-text.c: (gl_view_text_new),
+       (construct_properties_editor), (update_object_from_editor_cb),
+       (update_editor_from_object_cb), (update_editor_from_label_cb),
+       (draw_hacktext):
+               Added shadow support to text object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@587
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+M      glabels2/src/view-text.c
+
+commit 5cc9f150f427f0b4e9cb70bd1b5a3cbd1818418d
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-02-18
+
+    2006-02-18 Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (draw_line_object):
+       * src/view-line.c: (gl_view_line_new),
+       (construct_properties_editor),
+       (update_canvas_item_from_object_cb),
+       (update_object_from_editor_cb), (update_editor_from_object_cb),
+       (update_editor_from_label_cb):
+               Added shadow support to line object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@586
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+M      glabels2/src/view-line.c
+
+commit dbcb557b5640362136324341b71a8d05ea87a476
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-02-17
+
+    2006-02-16 Jim Evins  <evins@snaught.com>
+
+       * src/view-box.c:
+               Comment changes.
+       * src/print.c: (draw_ellipse_object):
+       * src/view-ellipse.c: (gl_view_ellipse_new),
+       (construct_properties_editor),
+       (update_canvas_item_from_object_cb),
+       (update_object_from_editor_cb), (update_editor_from_object_cb),
+       (update_editor_from_label_cb):
+               Added shadow support to ellipse object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@585
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+
+commit 31c2b2eec7aee4e95da2b4b14f15b3cb0313fb34
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-02-16
+
+    2006-02-15 Jim Evins  <evins@snaught.com>
+
+       * src/label-object.c:
+               Changed default shadow offsets.
+       * src/view-box.c: (gl_view_box_new):
+               Simplified gl_view_box_new() so that is does not
+               duplicate code
+               in update_canvas_item_from_object_cb().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@584
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-object.c
+M      glabels2/src/view-box.c
+
+commit 4a68c33f4b10396ae9835a73db093b1b3c855446
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-02-08
+
+    2006-02-07 Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+               Fixed color groups of color combos.
+       * src/color.h:
+               Added default shadow color.
+       * src/object-editor.c: (gl_object_editor_construct_color_combo):
+               Added shadow color group.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@583
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/src/color.h
+M      glabels2/src/object-editor.c
+
+commit 98beec748e072395765a1b648b6c77cae18fa8da
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-02-07
+
+    2006-02-06 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-shadow-page.c:
+               Forgot to add this file.
+       * src/view-box.c: (gl_view_box_new),
+       (update_canvas_item_from_object_cb),
+       (update_editor_from_label_cb):
+               Update limits on shadow offset spinbuttons.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@582
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+A      glabels2/src/object-editor-shadow-page.c
+M      glabels2/src/view-box.c
+
+commit 40e256fa0bafd52f616ee3c6696efe6702d256f9
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-01-20
+
+    2006-01-19 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c: (gl_merge_evolution_get_key_list):
+               Initialize key_list to NULL.  Only lucky that this worked
+               at all -- will
+               probably crash for many people.
+       * data/glade/object-editor.glade:
+       * src/Makefile.am:
+       * src/color.c:
+       * src/color.h:
+       * src/label-object.c:
+       * src/label-object.h:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-private.h:
+       * src/object-editor.c:
+       * src/object-editor.h:
+       * src/xml-label.c:
+               Created infrastructure for shadow support.
+       * src/view-box.c:
+       * src/print.c:
+               Initial shadow support in box object only.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@581
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/src/Makefile.am
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/print.c
+M      glabels2/src/view-box.c
+M      glabels2/src/xml-label.c
+
+commit af70df1732fa8a56a2ff3319ed2ee4c255c72c61
+Author: Jim Evins <evins@snaught.com>
+Date:  2006-01-05
+
+    2006-01-05 Jim Evins  <evins@snaught.com>
+
+       * src/merge-properties-dialog.c: (src_changed_cb):
+               Be extra paranoid before calling strcmp().
+       * src/merge.c: (gl_merge_set_src):
+               Don't make (merge == NULL) a critical error.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@580
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge.c
+
+commit bb0499ec358adc1cc8e0fe1ed0c53b420f99aa12
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-22
+
+    2005-12-22 Jim Evins  <evins@snaught.com>
+
+       * src/glabels-batch.c: (main):
+               Compile warning free with gcc 4.0.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@569
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/glabels-batch.c
+
+commit 58c00e66b430132afeb2cdfd1411668a9c5646cd
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-22
+
+    2005-12-21 Jim Evins  <evins@snaught.com>
+
+       * glabels.spec.in:
+               Updated example RPM spec file.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@568
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-decl-list.txt
+M      glabels2/glabels.spec.in
+
+commit 3c89931fbeec7d5de710bf1c9b03e01e25c8c157
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-22
+
+       * NEWS:
+       * configure.in:
+               Preparation for 2.1.2.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@567
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+M      glabels2/configure.in
+
+commit 1dd5d023b5989dda77cd4afe03b6a321ae4f78fb
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-21
+
+    2005-12-20 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+               Define unique G_LOG_DOMAIN for glabels.
+       * src/critical-error-handler.c: (gl_critical_error_handler_init):
+       * src/warning-handler.c: (gl_warning_handler_init),
+       (warning_handler):
+               Register for G_LOG_DOMAIN instead of NULL.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@566
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+M      glabels2/src/critical-error-handler.c
+M      glabels2/src/warning-handler.c
+
+commit fc0b866a373a89285aa1d507d412b5a9d8e9d12d
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-10
+
+    2005-12-10 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c:
+       * src/merge-vcard.c:
+               Fixed indentation.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@565
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/merge-vcard.c
+
+commit 9e26662eaa578f1d48636e503ceee998f192c8cd
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-09
+
+    2005-12-08 Jim Evins  <evins@snaught.com>
+
+       * libglabels/paper.c: (read_paper_files_from_dir):
+       * libglabels/template.c: (gl_template_register),
+       (read_template_files_from_dir):
+       * libglabels/xml-paper.c: (gl_xml_paper_read_papers_from_file),
+       (gl_xml_paper_parse_papers_doc):
+       * libglabels/xml-template.c:
+       (gl_xml_template_read_templates_from_file),
+       (gl_xml_template_parse_templates_doc),
+       (gl_xml_template_parse_template_node),
+       (xml_parse_label_rectangle_node), (xml_parse_label_round_node),
+       (xml_parse_label_cd_node), (xml_parse_layout_node),
+       (xml_parse_markup_margin_node), (xml_parse_markup_line_node),
+       (xml_parse_markup_circle_node),
+       (gl_xml_template_write_templates_to_file),
+       (xml_create_label_node):
+       * libglabels/xml.c: (gl_xml_get_prop_length):
+               Re-classified g_warnings to g_messages.
+       * src/Makefile.am:
+       * src/glabels.c: (main):
+       * src/warning-handler.c: (gl_warning_handler_init),
+       (warning_handler):
+       * src/warning-handler.h:
+               Added warning message handler to make sure the user is
+               presented with appropriate non-fatal errors.
+       * src/critical-error-handler.c: (critical_error_handler):
+               Changed exit to abort.
+       * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new),
+       (render_pass1):
+       * src/bc-postnet.c: (postnet_code):
+       * src/bc.c: (id_to_index), (name_to_index):
+       * src/merge.c: (gl_merge_register_backend), (gl_merge_new):
+       * src/object-editor.c: (gl_object_notebook_construct_valist):
+       * src/prefs-dialog.c: (update_locale_page_from_prefs):
+       * src/prefs.c: (gl_prefs_get_units_per_point),
+       (gl_prefs_get_units_precision), (gl_prefs_get_units_step_size),
+       (gl_prefs_get_units_string):
+       * src/print.c: (draw_outline), (clip_to_outline),
+       (clip_punchouts):
+       * src/splash.c: (gl_splash):
+       * src/ui-commands.c: (gl_ui_cmd_help_contents):
+       * src/view-highlight.c: (gl_view_highlight_new),
+       (highlight_resizable_box_construct), (object_changed_cb),
+       (view_scale_changed_cb):
+       * src/view.c: (draw_label_layer), (draw_bg_fg_layers),
+       (draw_markup_layer), (draw_markup_margin),
+       (gl_view_object_create_mode), (canvas_event),
+       (selection_received_cb):
+       * src/wdgt-mini-preview.c: (mini_outline_list_new):
+       * src/wdgt-rotate-label.c: (mini_preview_canvas_update):
+       * src/xml-label-04.c: (gl_xml_label_04_parse),
+       (xml04_parse_media_description), (xml04_parse_text_props),
+       (xml04_parse_barcode_props):
+       * src/xml-label-191.c: (gl_xml_label_191_parse),
+       (xml191_parse_objects), (xml191_parse_object),
+       (xml191_parse_text_props), (xml191_parse_image_props),
+       (xml191_parse_barcode_props), (xml191_parse_data),
+       (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_layout),
+       (xml191_parse_markup):
+       * src/xml-label.c: (gl_xml_label_open),
+       (gl_xml_label_open_buffer),
+       (xml_doc_to_label), (xml_parse_label), (xml_parse_objects),
+       (xml_parse_object_text), (xml_parse_object_image),
+       (xml_parse_object_barcode), (xml_parse_data),
+       (xml_parse_toplevel_span), (gl_xml_label_save),
+       (xml_create_objects):
+               Re-classified g_warnings to g_messages.
+       * src/merge-evolution.c: (gl_merge_evolution_open),
+       (gl_merge_evolution_close), (gl_merge_evolution_get_record):
+               Use g_warning to output errors encountered while
+               communicating with the evolution data server
+               instead of embedding them in the data.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@564
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc.c
+M      glabels2/src/critical-error-handler.c
+M      glabels2/src/glabels.c
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/merge.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs.c
+M      glabels2/src/print.c
+M      glabels2/src/splash.c
+M      glabels2/src/ui-commands.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view.c
+C064   glabels2/src/critical-error-handler.c
+glabels2/src/warning-handler.c
+A      glabels2/src/warning-handler.h
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 599f3be4bcea39fb4da1ee940be7d566abd1abef
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-12-09
+
+    2005-12-08 Jim Evins  <evins@snaught.com>
+
+       * libglabels/libglabels-private.h:
+               Set G_LOG_DOMAIN
+       * libglabels/paper.c: (read_papers):
+       * libglabels/template.c: (read_templates):
+               Made appropriate warnings critical.
+       * src/Makefile.am:
+       * src/critical-error-handler.h:
+       * src/critical-error-handler.c: (gl_critical_error_handler_init),
+       (critical_error_handler):
+               Created critical error handler.
+       * src/glabels.c: (main):
+               Register critical error handler.
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_init):
+       * src/object-editor.c: (gl_object_editor_init):
+       * src/prefs-dialog.c: (gl_prefs_dialog_init):
+       * src/template-designer.c: (gl_template_designer_init):
+       * src/ui-property-bar.c: (gl_ui_property_bar_instance_init):
+               Made appropriate warnings critical.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@563
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/template.c
+M      glabels2/src/Makefile.am
+A      glabels2/src/critical-error-handler.c
+A      glabels2/src/critical-error-handler.h
+M      glabels2/src/glabels.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+
+commit e44d2f82ab2179a7c5003d0efd852345c97e2d40
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-11-27
+
+    2005-11-27 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c: (gl_merge_evolution_get_key_list),
+       (gl_merge_evolution_get_primary_key),
+       (gl_merge_evolution_get_record):
+               Don't create "record_key" pseudo-key.  Don't populate
+               fields with null data.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@562
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+
+commit 25379fe60c61d9a7ba38a4fee58457dda8f0f1ac
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-11-26
+
+    2005-11-25 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c: (gl_merge_evolution_finalize),
+       (gl_merge_evolution_get_key_list), (gl_merge_evolution_open),
+       (gl_merge_evolution_get_record), (gl_merge_evolution_copy),
+       (free_field_list):
+               Query EDS for all supported fields.  Patch provided by
+               Austin Henry <ahenry@users.sourceforge.net>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@561
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+
+commit 648ed6853c2c7dd6e94af0db1a3d6c1b92643a73
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-30
+
+    2005-10-29 Jim Evins  <evins@snaught.com>
+
+       * src/glabels.c: (main):
+       * src/label-barcode.c: (gl_label_barcode_finalize):
+       * src/label-text.c: (gl_label_text_finalize), (set_font_family):
+       * src/label.c: (gl_label_instance_init), (gl_label_finalize):
+       * src/object-editor.c: (gl_object_editor_finalize):
+               Another pass at valgrinding -- plugged several memory
+               leaks.
+       * src/view-text.c: (gl_view_text_new),
+       (update_canvas_item_from_object_cb), (draw_hacktext):
+               Commented out artifacts of edit-in-place code.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@560
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/glabels.c
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-text.c
+M      glabels2/src/label.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/view-text.c
+
+commit 76fd90ffd79f73f4d8cd9acc009696a12db77e1e
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-28
+
+    2005-10-28 Jim Evins  <evins@snaught.com>
+
+       * src/canvas-hacktext.c: (gl_canvas_hacktext_set_arg):
+               Fixed use of uninitialized variable.  Caught by
+               d binderman <dcb314@hotmail.com>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@559
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/canvas-hacktext.c
+
+commit 71e143d2eec8f00cc33b766b6e5dabdf117425ce
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-28
+
+    2005-10-27 Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c: (gl_merge_evolution_get_record):
+       * src/merge-vcard.c: (gl_merge_vcard_get_record),
+       (parse_next_vcard):
+               Additional cleanup of EDS and vcard backends.  Provided by
+               Austin Henry <ahenry@users.sourceforge.net>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@558
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-evolution.c
+M      glabels2/src/merge-vcard.c
+
+commit 6564675732a6cf86f70960aa83070cc64e940235
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-25
+
+    2005-10-24 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * src/Makefile.am:
+       * src/merge-evolution.c:
+       * src/merge-evolution.h:
+       * src/merge-init.c: (gl_merge_init):
+       * src/merge-properties-dialog.c: (type_changed_cb):
+       * src/merge-vcard.c:
+       * src/merge-vcard.h:
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+               Added Evolution Data Server and VCard merge backends.
+               Original patch
+               provided by Austin Henry <ahenry@users.sourceforge.net>.
+       * configure.in:
+               Only support EDS and VCard backends if libebook is
+               installed.  Allow
+               user to disable support, even if installed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@557
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/merge-evolution.c
+A      glabels2/src/merge-evolution.h
+M      glabels2/src/merge-init.c
+M      glabels2/src/merge-properties-dialog.c
+A      glabels2/src/merge-vcard.c
+A      glabels2/src/merge-vcard.h
+M      glabels2/src/ui-commands.c
+
+commit 1b1e0d9590f300773c89589eab03c4f8a5db3f45
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-24
+
+    2005-10-24 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Collected all template changes and submissions since last
+               release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@556
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/zweckform-iso-templates.xml
+
+commit 2bd3499f59f15f1ba3d83aca12dc895ede9c9fcc
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-24
+
+    2005-10-23 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * data/mime/Makefile.am:
+               Added configure options to disable update-mime-database
+               and
+               update-desktop-database as part of the install.  Patch
+               provided by Leonardo Boshell (qhoracio@sourceforge.net).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@555
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/data/mime/Makefile.am
+M      glabels2/gtk-doc.make
+
+commit ec932804d8b229fff5fea65452a4f6d0982e7cb1
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-23
+
+    2005-10-23 Jim Evins  <evins@snaught.com>
+
+       * libglabels/xml.h:
+       * libglabels/xml.c: (gl_xml_get_prop_string),
+       (gl_xml_get_prop_i18n_string), (gl_xml_set_prop_string),
+       (gl_xml_is_node), (gl_xml_get_node_content):
+               Added new XML utility functions.
+       * libglabels/xml-paper.c:
+       * libglabels/xml-template.c:
+       * src/xml-label.c:
+               Cleanup by using new xml utilities created above.
+       * libglabels/paper.c: (gl_paper_free):
+       * src/file.c: (new_response):
+       * src/object-editor-image-page.c: (add_image_filters_to_chooser):
+       * src/pixbuf-cache.c: (gl_pixbuf_cache_add_pixbuf),
+       (gl_pixbuf_cache_get_pixbuf):
+       * src/ui-property-bar.c:
+       (gl_ui_property_bar_construct_color_combo):
+       * src/view-highlight.c: (gl_view_highlight_finalize):
+       * src/view-image.c: (update_object_from_editor_cb):
+       * src/view.c: (gl_view_finalize), (draw_bg_fg_layers),
+       (draw_bg_fg_rounded_rect), (draw_bg_fg_round), (draw_bg_fg_cd),
+       (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin),
+       (draw_markup_margin_rect), (draw_markup_margin_rounded_rect),
+       (draw_markup_margin_round), (draw_markup_margin_cd),
+       (draw_markup_margin_cd_bc):
+       * src/wdgt-mini-preview.c: (mini_outline_list_new):
+       * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_finalize):
+               Plugged various memory leaks located with valgrind.
+       * src/view-image.c: (update_canvas_item_from_object_cb):
+               Don't allow a width or height of zero when drawing pixbuf.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@554
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/libglabels/xml.h
+M      glabels2/src/file.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/pixbuf-cache.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/xml-label.c
+
+commit cba39e6ae22742514a61a6c822d26f83613e45a7
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-23
+
+    2005-10-22 Jim Evins  <evins@snaught.com>
+
+       * libglabels/xml-paper.c:
+       * libglabels/xml-template.c:
+       * libglabels/xml.c:
+       * src/base64.c:
+       * src/bc-gnubarcode.c:
+       * src/canvas-hacktext.c:
+       * src/label-text.c:
+       * src/object-editor-data-page.c:
+       * src/print-dialog.c:
+       * src/print.c:
+       * src/recent.c:
+       * src/template-designer.c:
+       * src/text-node.c:
+       * src/ui-property-bar.c:
+       * src/ui.c:
+       * src/view-barcode.c:
+       * src/view-box.c:
+       * src/view-ellipse.c:
+       * src/view-image.c:
+       * src/view-line.c:
+       * src/view-text.c:
+       * src/view.c:
+       * src/wdgt-media-select.c:
+       * src/xml-label-04.c:
+       * src/xml-label-191.c:
+       * src/xml-label.c:
+               Modified to compile warning free with gcc-4.0.  Mostly
+               casting to change signedness of characters.  Did not
+               attack gnu-barcode library yet.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@553
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/src/base64.c
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/recent.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/text-node.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit afd036875ddd1bc5ca13c3b1ac353f81187df194
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-10-22
+
+    2005-10-22 Jim Evins <evins@snaught.com>
+
+       * src/glabels.c: (main):
+       * src/splash.c: (gl_splash):
+               Removed some small memory leaks.
+       * gtk-doc.make:
+               Added.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@552
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+A      glabels2/gtk-doc.make
+M      glabels2/src/glabels.c
+M      glabels2/src/splash.c
+
+commit 39d8141f74f981643811f13b1fb09b5f6339b57f
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-09-20
+
+    2005-09-19 Jim Evins  <evins@snaught.com>
+
+       * data/glade/property-bar.glade:
+               Remove items from font_family_combo.  This prevents the
+               double entry after adding text model and list of fonts.
+       * src/ui-property-bar.c: (reset_to_default_properties):
+               Free font_family_list.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@551
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/property-bar.glade
+M      glabels2/src/ui-property-bar.c
+
+commit da392ae3611dbf3b5cfb3bc89e6ccfa652e47380
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-07-02
+
+    2005-07-01 Jim Evins  <evins@snaught.com>
+
+       * po/it.po:
+               Updated italian translation (Daniele Medri)
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@550
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/it.po
+
+commit ae2bf27499f3e297a2bd73f20ca9697a67bd1006
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-26
+
+    I guess I need it after all -- however, it needs to be empty.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@545
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/docs/libglabels/libglabels.types
+
+commit 243b3dc521a2fc222d31bd139abac37bd0adef1b
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-26
+
+    2005-06-26 Jim Evins  <evins@snaught.com>
+
+       * docs/libglabels/libglabels-decl-list.txt:
+               Somehow never got checked in before.
+       * docs/libglabels/libglabels.types:
+               Removed -- don't need it afterall.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@544
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+A      glabels2/docs/libglabels/libglabels-decl-list.txt
+D      glabels2/docs/libglabels/libglabels.types
+
+commit c4eb1a543ab5897431bc2a4796785c4aca7bfe9b
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-21
+
+    2005-06-20 Jim Evins  <evins@snaught.com>
+
+       * NEWS:
+               Final prep for 2.1.1 release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@543
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+
+commit 0e3ae99f1dfcb00a6e6e5f320f1159b732960b73
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-21
+
+    2005-06-20 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Final preps for 2.1.1 release.
+       * docs/libglabels/libglabels.types:
+               Somehow never got checked in before.
+       * po/POTFILES.in:
+               Bring up-to-date with recent reorg of ui code.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@542
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+A      glabels2/docs/libglabels/libglabels.types
+M      glabels2/po/POTFILES.in
+
+commit 266a744f8ad5d09df9daa095adab2f7b76f69bec
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-19
+
+    2005-06-19 Jim Evins  <evins@snaught.com>
+
+       * src/template-designer.c: (construct_layout_page):
+               Removed attempt to match background color of mini preview
+               widget to
+               background.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@540
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/template-designer.c
+
+commit 3c72bfece4ac69e74d1de4b7c2abd7cd94d2a548
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-18
+
+    2005-06-17 Jim Evins  <evins@snaught.com>
+
+       * help/C/figures/merge-ex2-4.png:
+       * help/C/glabels.xml:
+               Fixed spelling error.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@539
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/help/C/figures/merge-ex2-4.png
+M      glabels2/help/C/glabels.xml
+
+commit 4e3e2f3a70c4670eb2dc905aafa743efa546c404
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-06-14
+
+    2005-06-13 Jim Evins  <evins@snaught.com>
+
+       * help/C/figures/merge-ex1-1.png:
+       * help/C/figures/merge-ex1-2.png:
+       * help/C/figures/merge-ex1-3.png:
+       * help/C/figures/merge-ex1-4.png:
+       * help/C/figures/merge-ex2-1.png:
+       * help/C/figures/merge-ex2-2.png:
+       * help/C/figures/merge-ex2-3.png:
+       * help/C/figures/merge-ex2-4.png:
+               Added figures for document merge tutorial.
+       * help/C/glabels.xml:
+               Added document merge tutorial.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@538
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+A      glabels2/help/C/figures/merge-ex1-1.png
+A      glabels2/help/C/figures/merge-ex1-2.png
+A      glabels2/help/C/figures/merge-ex1-3.png
+A      glabels2/help/C/figures/merge-ex1-4.png
+A      glabels2/help/C/figures/merge-ex2-1.png
+A      glabels2/help/C/figures/merge-ex2-2.png
+A      glabels2/help/C/figures/merge-ex2-3.png
+A      glabels2/help/C/figures/merge-ex2-4.png
+M      glabels2/help/C/glabels.xml
+
+commit 541b2920873eb6bfe225e8a7c573e41917c5dae5
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-20
+
+    2005-05-19 Jim Evins  <evins@snaught.com>
+
+       * data/glade/merge-properties-dialog.glade:
+               Fixed irregular spacing.
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_init),
+       (gl_merge_properties_dialog_construct):
+               Set outer padding and remove separator.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@536
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/merge-properties-dialog.glade
+M      glabels2/src/merge-properties-dialog.c
+
+commit 43beed37015c722577065ec11a431f75651b8199
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-19
+
+    2005-05-18 Jim Evins  <evins@snaught.com>
+
+       * src/hig.h:
+       * src/hig.c:
+               Removed glHigDialog class.
+       * src/file.c: (gl_file_new), (create_new_dialog_widgets),
+       (gl_file_properties), (create_properties_dialog_widgets):
+       * src/prefs-dialog.h:
+       * src/prefs-dialog.c: (gl_prefs_dialog_get_type),
+       (gl_prefs_dialog_init), (gl_prefs_dialog_construct):
+       * src/print-dialog.h:
+       * src/prefs-dialog.h:
+       * src/print-dialog.c: (gl_print_dialog_get_type),
+       (gl_print_dialog_init), (gl_print_dialog_construct):
+               Replaced all instances of glHigDialog with GtkDialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@535
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/file.c
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+
+commit b75ae61753d37cd5b74f393cfb8a207d0e0ae3bc
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-18
+
+    2005-05-17 Jim Evins  <evins@snaught.com>
+
+       * src/hig.h:
+       * src/hig.c:
+               Removed HigAlert class since it is obsoleted by the
+               GtkMessageDialog class.
+       * src/file.c: (open_response), (gl_file_open_real),
+       (gl_file_save),
+       (save_as_response), (gl_file_close):
+               Replaced all instances of HigAlert widgets with
+               GtkMessageDialog widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@534
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/file.c
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+
+commit da21e95810774f0c12cca0694d7c444a1c5dd3f2
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-16
+
+    2005-05-15 Jim Evins  <evins@snaught.com>
+
+       * src/ui-commands.h:
+       * src/ui-util.c:
+       * src/ui-util.h:
+       * src/ui.c:
+       * src/ui.h:
+       * src/view.c:
+       * src/window.c:
+       * src/window.h:
+               A little code reformatting -- no functional changes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@533
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-commands.h
+M      glabels2/src/ui-util.c
+M      glabels2/src/ui-util.h
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/view.c
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit cfdd17795f804b342a1551d517a44ae60f47e917
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-15
+
+    2005-05-14 Jim Evins  <evins@snaught.com>
+
+       * src/Makefile.am:
+               Removed obsolete macros.
+       * src/marshal.list:
+               Added marshalling template to support new view signal:
+               "context_menu_activate."
+       * src/view.h:
+       * src/view.c: (gl_view_class_init), (gl_view_construct),
+       (canvas_event_arrow_mode):
+               - Removed hardcoded context menus and added new signal
+               "context_menu_activate"
+               to push this up to the uimanager.
+               - Removed merge properties and print dialogs so that
+               they can be managed with
+               the window by the uimanager.
+       * src/merge-properties-dialog.h:
+       * src/merge-properties-dialog.c: (gl_merge_properties_dialog_new),
+       (gl_merge_properties_dialog_construct):
+               Changed calling convention of
+               gl_merge_properties_dialog_new() to use
+               glLabel and GtkWindow instead of view to make more
+               consistent with other
+               dialogs.
+       * src/print-dialog.h:
+       * src/print-dialog.c: (gl_print_dialog_new),
+       (gl_print_dialog_construct):
+               Removed last artifact of libbonoboui.
+       * src/ui-commands.c: (gl_ui_cmd_file_print),
+       (gl_ui_cmd_objects_merge_properties), (gl_ui_cmd_help_about):
+               Reconciled style for launching dialogs.
+       * src/ui.c: (gl_ui_new):
+               Added context menus to ui manager.
+       * src/view-object.c: (item_event_arrow_mode):
+               No longer try to select objects with right-click.
+       * src/window.h:
+       * src/window.c: (gl_window_init), (gl_window_set_label),
+       (context_menu_activate_cb):
+               Context menus and all dialogs are now managed in a
+               consistent way in window
+               by the ui manager.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@532
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/Makefile.am
+M      glabels2/src/marshal.list
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 843936402808e55c2be7970c22ecbaaafe2f7f73
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-12
+
+    2005-05-11 Jim Evins  <evins@snaught.com>
+
+       * src/window.h:
+       * src/window.c: (gl_window_init), (gl_window_destroy):
+       * src/ui.c: (gl_ui_new), (gl_ui_unref), (recent_tooltip_func):
+       * src/ui-commands.c: (gl_ui_cmd_file_open_recent):
+               Moved management of recent_view back from window.c to
+               ui.c -- it just feels
+               better there.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@531
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-commands.c
+M      glabels2/src/ui.c
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 1479a95e84b51da3faee9a7a263c032b19afc3e4
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-11
+
+    2005-05-10 Jim Evins  <evins@snaught.com>
+
+       * src/window.h:
+       * src/window.c: (gl_window_init):
+       * src/ui.h:
+       * src/ui.c: (gl_ui_new), (connect_proxy_cb),
+       (disconnect_proxy_cb),
+       (menu_item_select_cb), (menu_item_deselect_cb):
+               Added GtkStatusbar which displays menu tooltips.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@530
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 6f2f4ee62487d346746d5fe8b8ed2801a72ce90b
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-05-09
+
+    2005-05-09 Jim Evins  <evins@snaught.com>
+
+       Replaced libbonoboui with GtkUIManager for creation of basic
+       user interface menus
+       and toolbars.
+
+       * configure.in:
+       * glabels.spec.in:
+               Removed dependencies on libbonoboui.
+       * data/Makefile.am:
+       * data/ui/Makefile.am:
+       * data/ui/glabels-ui.xml:
+               Removed data/ui directory.
+       * data/glade/Makefile.am:
+       * data/property-bar.glade:
+               Added glade description of property-bar for new libglade
+               implementation
+               of glUIPropertyBar.
+       * src/Makefile.am:
+       * src/commands.h:
+       * src/commands.c:
+       * src/tools.h:
+       * src/tools.c:
+       * src/ui-commands.h:
+       * src/ui-commands.c:
+               Replaced commands.[ch] and tools.[ch] with the single
+               ui-commands.[ch] module
+               since the distinction between "commands" and "tools"
+               is no longer that clear.
+       * src/file.h:
+       * src/file.c:
+               Modified to expect glWindow instead of GtkWindow.
+               gl_file_open_recent()
+               no longer has knowledge of eggRecent*.
+       * src/glabels.c: (main):
+               Removed libbonobo initialization and replaced bonobo_main
+               loop with gtk_main
+               loop.
+       * src/object-editor.c: (gl_object_editor_init):
+               Make sure notebook does not respond to a "show_all"
+               on the parent.
+       * src/recent-files/Makefile.am:
+       * src/recent-files/*.[ch]
+               Updated from latest version of libegg which now has a
+               view based on
+               GtkUIManager.  Removed unused bonobo and gtk views.
+       * src/ui-property-bar.h:
+       * src/ui-property-bar.c:
+               New implementation based on libglade.
+       * src/ui-sidebar.h:
+       * src/ui-sidebar.c:
+               Sidebar is now simply a GtkWidget and does not expect
+               to be a part of
+               a libbonoboui interface.
+       * src/ui-util.h:
+       * src/ui-util.c:
+       * src/ui.h:
+       * src/ui.c:
+               Converted for use with GtkUIManager.
+       * src/window.h:
+       * src/window.c:
+               Now derived from GtkWindow instead of BonoboWindow and
+               uses GtkUIManager
+               to create menus and toolbars.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@529
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/data/Makefile.am
+M      glabels2/data/glade/Makefile.am
+A      glabels2/data/glade/property-bar.glade
+D      glabels2/data/ui/Makefile.am
+D      glabels2/data/ui/glabels-ui.xml
+M      glabels2/glabels.spec.in
+M      glabels2/src/Makefile.am
+D      glabels2/src/commands.c
+D      glabels2/src/commands.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/recent-files/Makefile.am
+M      glabels2/src/recent-files/egg-recent-item.c
+M      glabels2/src/recent-files/egg-recent-item.h
+M      glabels2/src/recent-files/egg-recent-model.c
+M      glabels2/src/recent-files/egg-recent-util.c
+D      glabels2/src/recent-files/egg-recent-view-bonobo.c
+D      glabels2/src/recent-files/egg-recent-view-bonobo.h
+D      glabels2/src/recent-files/egg-recent-view-gtk.c
+D      glabels2/src/recent-files/egg-recent-view-gtk.h
+A      glabels2/src/recent-files/egg-recent-view-uimanager.c
+A      glabels2/src/recent-files/egg-recent-view-uimanager.h
+M      glabels2/src/recent-files/egg-recent-view.c
+M      glabels2/src/recent-files/egg-recent.h
+D      glabels2/src/tools.c
+D      glabels2/src/tools.h
+A      glabels2/src/ui-commands.c
+A      glabels2/src/ui-commands.h
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-sidebar.h
+M      glabels2/src/ui-util.c
+M      glabels2/src/ui-util.h
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 15816dc54a53451be050144db535e67af6db88f8
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-26
+
+    2005-04-25 Jim Evins  <evins@snaught.com>
+
+       * data/templates/misc-iso-templates.xml:
+               Added Fellows 04715 template provided by Steve Saxon.
+       * AUTHORS:
+               Updated acknowledgement for above.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@528
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/misc-iso-templates.xml
+
+commit 6bb6a3435ecfd07583605dda070accf9996ec165
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-24
+
+    2005-04-23 Jim Evins  <evins@snaught.com>
+
+       * src/util.c: (gl_util_combo_box_set_strings):
+               Make sure to clear model before loading a new list
+               of strings.
+       * src/wdgt-media-select.h:
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_instance_init),
+       (gl_wdgt_media_select_construct), (page_size_combo_changed_cb),
+       (template_combo_changed_cb), (prefs_changed_cb),
+       (gl_wdgt_media_select_get_name), (gl_wdgt_media_select_set_name),
+       (gl_wdgt_media_select_get_page_size),
+       (gl_wdgt_media_select_set_page_size):
+               Replaced the deprecated GtkCombo widget with the new
+               GtkComboBox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@527
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/util.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+
+commit caf7fa47549bd5e82771dae7352a3e9df54876a5
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-22
+
+    2005-04-21 Jim Evins  <evins@snaught.com>
+
+       * data/glade/template-designer.glade:
+       * src/template-designer.c: (construct_pg_size_page),
+       (pg_size_page_changed_cb), (build_template):
+               Replaced the deprecated GtkCombo widget with the new
+               GtkComboBox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@526
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/template-designer.glade
+M      glabels2/src/template-designer.c
+
+commit e95389e41390751097436307edb19d49963e3e59
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-21
+
+    2005-04-20 Jim Evins  <evins@snaught.com>
+
+       * data/glade/prefs-dialog.glade:
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs), (update_prefs_from_object_page):
+               Replaced the deprecated GtkCombo widget with the new
+               GtkComboBox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@525
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/prefs-dialog.glade
+M      glabels2/src/prefs-dialog.c
+
+commit 2c6b6469e0956561eed729f5d56865456abfec50
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-20
+
+    2005-04-19 Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page),
+       (style_changed_cb), (gl_object_editor_set_bc_style),
+       (gl_object_editor_get_bc_style), (gl_object_editor_set_bc_color),
+       (gl_object_editor_get_bc_color):
+       * src/object-editor-data-page.c:
+       (gl_object_editor_prepare_data_page), (gl_object_editor_set_data),
+       (gl_object_editor_get_data):
+       * src/object-editor-edit-page.c:
+       (gl_object_editor_prepare_edit_page), (insert_button_cb):
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_prepare_fill_page),
+       (gl_object_editor_set_fill_color),
+       (gl_object_editor_get_fill_color):
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page),
+       (gl_object_editor_set_image), (gl_object_editor_get_image):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page),
+       (gl_object_editor_set_line_color),
+       (gl_object_editor_get_line_color):
+       * src/object-editor-private.h:
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_font_family),
+       (gl_object_editor_get_font_family),
+       (gl_object_editor_set_text_color),
+       (gl_object_editor_get_text_color):
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+       * src/ui-sidebar.c:
+               In the object editor: replaced all instances of the
+               deprecated
+               GtkCombo widget with the new GtkComboBox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@524
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/ui-sidebar.c
+
+commit 39acef8eb6f976d76c3c7f4cce0a2b546467e2e5
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-19
+
+    2005-04-18 Jim Evins  <evins@snaught.com>
+
+       * src/stock.c:
+               Neglected to save this one in previous checkin to support
+               header cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@523
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/stock.c
+
+commit 174223a5516fbfc5e3b4a865b8310b51bed3dee2
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-18
+
+    2005-04-17 Jim Evins  <evins@snaught.com>
+
+       * libglabels/libglabels-private.h:
+       * libglabels/paper.c:
+       * libglabels/paper.h:
+       * libglabels/template.c:
+       * libglabels/template.h:
+       * libglabels/xml-paper.c:
+       * libglabels/xml-paper.h:
+       * libglabels/xml-template.c:
+       * libglabels/xml.c:
+       * libglabels/xml.h:
+       * src/base64.c:
+       * src/base64.h:
+       * src/bc-gnubarcode.c:
+       * src/bc-postnet.c:
+       * src/bc.c:
+       * src/bc.h:
+       * src/commands.c:
+       * src/debug.c:
+       * src/debug.h:
+       * src/file.c:
+       * src/file.h:
+       * src/hig.c:
+       * src/hig.h:
+       * src/label-barcode.c:
+       * src/label-box.c:
+       * src/label-ellipse.c:
+       * src/label-image.c:
+       * src/label-image.h:
+       * src/label-line.c:
+       * src/label-object.c:
+       * src/label-text.c:
+       * src/label-text.h:
+       * src/label.c:
+       * src/merge-properties-dialog.c:
+       * src/object-editor-bc-page.c:
+       * src/object-editor-data-page.c:
+       * src/object-editor-edit-page.c:
+       * src/object-editor-fill-page.c:
+       * src/object-editor-image-page.c:
+       * src/object-editor-line-page.c:
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-private.h:
+       * src/object-editor-size-page.c:
+       * src/object-editor-text-page.c:
+       * src/object-editor.c:
+       * src/object-editor.h:
+       * src/pixbuf-cache.h:
+       * src/prefs-dialog.c:
+       * src/prefs-dialog.h:
+       * src/prefs-model.c:
+       * src/prefs-model.h:
+       * src/prefs.c:
+       * src/print-dialog.c:
+       * src/print-dialog.h:
+       * src/print.c:
+       * src/print.h:
+       * src/recent.c:
+       * src/recent.h:
+       * src/splash.c:
+       * src/splash.h:
+       * src/stock.h:
+       * src/template-designer.c:
+       * src/template-designer.h:
+       * src/text-node.h:
+       * src/tools.c:
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct):
+       * src/ui-sidebar.c:
+       * src/ui-util.c:
+       * src/ui.c:
+       * src/util.c:
+       * src/util.h:
+       * src/view-barcode.c:
+       * src/view-box.c:
+       * src/view-ellipse.c:
+       * src/view-highlight.c:
+       * src/view-highlight.h:
+       * src/view-image.c:
+       * src/view-line.c:
+       * src/view-object.c:
+       * src/view-object.h:
+       * src/view-text.c:
+       * src/view.c:
+       * src/view.h:
+       * src/wdgt-chain-button.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-media-select.h:
+       * src/wdgt-mini-preview.c:
+       * src/wdgt-mini-preview.h:
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-print-merge.h:
+       * src/wdgt-rotate-label.c:
+       * src/wdgt-rotate-label.h:
+       * src/window.c:
+       * src/window.h:
+       * src/xml-label-04.c:
+       * src/xml-label-191.c:
+       * src/xml-label.c:
+               Cleanup of header files:
+               - all header files are now stand-alone, verified by
+               including
+                 first in corresponding "c" files
+               - replaced blanket includes of gnome, gtk, and glib with
+                 targetted includes
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@522
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-paper.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/libglabels/xml.h
+M      glabels2/src/base64.c
+M      glabels2/src/base64.h
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/commands.c
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/label.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-edit-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/pixbuf-cache.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/recent.c
+M      glabels2/src/recent.h
+M      glabels2/src/splash.c
+M      glabels2/src/splash.h
+M      glabels2/src/stock.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.h
+M      glabels2/src/text-node.h
+M      glabels2/src/tools.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-util.c
+M      glabels2/src/ui.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-highlight.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-chain-button.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 8b5703b7bbbbb9c7bd88090bc6d3b58aee4e99f8
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-16
+
+    2005-04-16 Jim Evins  <evins@snaught.com>
+
+       * data/glade/Makefile.am:
+       * data/glade/merge-properties-dialog.glade:
+               Added merge properties dialog glade description file.
+       * src/merge-properties-dialog.h:
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_get_type),
+       (gl_merge_properties_dialog_init),
+       (gl_merge_properties_dialog_finalize),
+       (gl_merge_properties_dialog_new),
+       (gl_merge_properties_dialog_construct), (type_changed_cb),
+       (src_changed_cb), (response_cb), (load_tree),
+       (record_select_toggled_cb), (select_all_button_clicked_cb),
+       (unselect_all_button_clicked_cb):
+               Modified merge properties dialog to use libglade.  Added
+               "select all" and "unselect all" buttons.
+       * src/merge-text.c: (parse_line):
+               Handle empty lines better.
+       * src/merge.c: (gl_merge_eval_key):
+               Evaluate the key whether the record is selected or not.
+       * src/util.h:
+       * src/util.c: (gl_util_combo_box_add_text_model):
+               Since libglade does not use the gtk_combo_box_new_text()
+               constructor for GtkComboBoxes, a utility function
+               was created
+               to add an appropriate text model to a GtkComboBox.
+       * src/view.c: (gl_view_edit_merge_props):
+               Removed unnecessary "show all's".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@521
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/Makefile.am
+A      glabels2/data/glade/merge-properties-dialog.glade
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view.c
+
+commit 7013c7014cd9f41690563913707fcfa25dfce5d6
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-16
+
+    2005-04-15 Jim Evins  <evins@snaught.com>
+
+       * po/ru.po:
+               Updated russian translation (Vitaly Lipatov)
+       * data/templates/misc-iso-templates.xml:
+               Added templates for russian business cards provided by
+               Vitaly Lipatov.
+       * AUTHORS:
+               Updated acknowledgements for above.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@520
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/po/ru.po
+
+commit d420b4bf2aa0b8ae7fc109fa795504ce7ea3309f
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-16
+
+    2005-04-15 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+               Added Avery 5388 and 5389 templates provided by Peter
+               L. Berghold.
+       * data/templates/misc-iso-templates.xml:
+               Added Ryman standard CD/DVD template, provided by
+               Dan Clark.
+       * AUTHORS:
+               Added acknowledgements for above.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@518
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+
+commit cceb27eeb72f647452215fb4bf724f2946428a46
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-10
+
+    2005-04-10 Jim Evins <evins@snaught.com>
+
+       * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node):
+       * libglabels/xml-template.c:
+       (gl_xml_template_parse_template_node),
+       (xml_parse_label_rectangle_node), (xml_parse_label_round_node),
+       (xml_parse_label_cd_node), (xml_parse_alias_node):
+       * libglabels/xml.c: (gl_xml_get_prop_double),
+       (gl_xml_get_prop_boolean), (gl_xml_get_prop_int),
+       (gl_xml_get_prop_uint), (gl_xml_get_prop_length):
+       * src/xml-label-04.c: (xml04_parse_media_description),
+       (xml04_parse_text_props), (xml04_parse_barcode_props),
+       (xml04_parse_merge_properties):
+       * src/xml-label-191.c: (xml191_parse_object),
+       (xml191_parse_text_props), (xml191_parse_barcode_props),
+       (xml191_parse_merge_fields), (xml191_parse_pixdata),
+       (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_markup),
+       (xml191_parse_alias):
+       * src/xml-label.c: (xml_parse_object_text),
+       (xml_parse_object_barcode), (xml_parse_merge_fields),
+       (xml_parse_pixdata), (xml_parse_toplevel_span):
+               Make sure to use xmlFree for anything obtained from libxml
+               in case libxml and glib use different memory management
+               space.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@516
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 21cb58ded51cba453457ac6c47517b32f5915f59
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-09
+
+    2005-04-08 Jim Evins <evins@snaught.com>
+
+       * src/util.h:
+       * src/util.c: (gl_util_combo_box_set_strings), (search_text_func),
+       (gl_util_combo_box_set_active_text):
+               Added utility functions to simplify working with
+               GtkComboBox
+               widgets in GTK-2.6.
+       * src/ui-property-bar.h:
+       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
+       (reset_to_default_properties), (update_text_properties),
+       (font_family_changed_cb):
+               Replaced deprecated GtkCombo with GtkComboBox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@515
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+
+commit d99e9af35cbdba98f6919c63e1d6e6755e2ab66f
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-04
+
+    2005-04-03 Jim Evins <evins@snaught.com>
+
+       * src/Makefile.am:
+       * src/wdgt-image-select.h:
+       * src/wdgt-image-select.c:
+               Removed obsolete wdgt-image-select.[ch] files.
+       * libglabels/paper.c: (gl_paper_dup):
+               Fixed rename of parameter introduced during documentation
+               updates.
+       * data/glade/object-editor.glade:
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page), (img_radio_toggled_cb),
+       (gl_object_editor_set_image), (gl_object_editor_get_image),
+       (update_preview_cb), (add_image_filters_to_chooser):
+       * src/object-editor-private.h:
+               Replaced deprecated GnomePixmapEntry with
+               GtkFileChooserButton.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@514
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/libglabels/paper.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-private.h
+D      glabels2/src/wdgt-image-select.c
+D      glabels2/src/wdgt-image-select.h
+
+commit 18e4f3780c76fb968f4ba57636b8c1ec66804b91
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-03
+
+    2005-04-02 Jim Evins <evins@snaught.com>
+
+       * src/mygal/mygal-combo-box.c: (deactivate_arrow),
+       (mygal_combo_box_popup_hide_unconditional),
+       (mygal_combo_box_popup_hide), (mygal_combo_box_popup_display),
+       (mygal_combo_toggle_pressed), (mygal_combo_box_init),
+       (mygal_combo_popup_tear_off), (mygal_combo_set_tearoff_state),
+       (mygal_combo_tearoff_bg_copy), (mygal_combo_popup_reparent),
+       (cb_tearable_button_release), (mygal_combo_box_set_tearable):
+               Renamed all internal gtk_combo functions to mygal_combo
+               to prevent namespace confusion.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@513
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/mygal/mygal-combo-box.c
+
+commit 27bba0435e5a44ee0a63086c01872eaf070ce3d0
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-03
+
+    2005-04-02 Jim Evins <evins@snaught.com>
+
+       * src/mygal/color-palette.c: (color_palette_change_custom_color),
+       (cust_color_set), (color_palette_setup):
+       * src/mygal/color-palette.h:
+               Replaced deprecated GnomeColorPicker with GtkColorButton.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@512
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/mygal/color-palette.c
+M      glabels2/src/mygal/color-palette.h
+
+commit 7fcb67653dc29f7449baa7f069c3d4bb2ecdd7e9
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-04-03
+
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/enums.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/xml-paper.sgml:
+       * docs/libglabels/tmpl/xml-template.sgml:
+       * libglabels/enums.h:
+       * libglabels/paper.c: (gl_paper_dup):
+       * libglabels/paper.h:
+       * libglabels/xml-paper.c:
+       * libglabels/xml-template.c:
+               More documentation updates for libglabels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@511
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/docs/libglabels/libglabels-sections.txt
+M      glabels2/docs/libglabels/libglabels-undocumented.txt
+M      glabels2/docs/libglabels/tmpl/enums.sgml
+M      glabels2/docs/libglabels/tmpl/paper.sgml
+M      glabels2/docs/libglabels/tmpl/xml-paper.sgml
+M      glabels2/docs/libglabels/tmpl/xml-template.sgml
+M      glabels2/libglabels/enums.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/paper.h
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+
+commit 4b3e8b953927a4350334909c55d0aa790591e3f3
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-03-24
+
+    2005-03-23 Jim Evins  <evins@snaught.com>
+
+       * INSTALL:
+               Automatically updated.
+       * Makefile.am:
+       * autogen.sh:
+       * configure.in:
+       * docs/Makefile.am:
+       * docs/libglabels/Makefile.am:
+       * docs/libglabels/libglabels-docs.sgml:
+       * docs/libglabels/libglabels-sections.txt:
+       * docs/libglabels/libglabels-undocumented.txt:
+       * docs/libglabels/tmpl/enums.sgml:
+       * docs/libglabels/tmpl/libglabels-unused.sgml:
+       * docs/libglabels/tmpl/libglabels.sgml:
+       * docs/libglabels/tmpl/paper.sgml:
+       * docs/libglabels/tmpl/template.sgml:
+       * docs/libglabels/tmpl/xml-paper.sgml:
+       * docs/libglabels/tmpl/xml-template.sgml:
+       * docs/libglabels/tmpl/xml.sgml:
+               Added basic gtk-doc stuff to support documenting
+               libglabels
+               API.
+       * libglabels/xml.c:
+               Updated function comments with gtk-doc markup.
+       * missing:
+               Removed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@510
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/INSTALL
+M      glabels2/Makefile.am
+M      glabels2/autogen.sh
+M      glabels2/configure.in
+A      glabels2/docs/Makefile.am
+A      glabels2/docs/libglabels/Makefile.am
+A      glabels2/docs/libglabels/libglabels-docs.sgml
+A      glabels2/docs/libglabels/libglabels-overrides.txt
+A      glabels2/docs/libglabels/libglabels-sections.txt
+A      glabels2/docs/libglabels/libglabels-undocumented.txt
+A      glabels2/docs/libglabels/tmpl/enums.sgml
+A      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
+A      glabels2/docs/libglabels/tmpl/libglabels.sgml
+A      glabels2/docs/libglabels/tmpl/paper.sgml
+A      glabels2/docs/libglabels/tmpl/template.sgml
+A      glabels2/docs/libglabels/tmpl/xml-paper.sgml
+A      glabels2/docs/libglabels/tmpl/xml-template.sgml
+A      glabels2/docs/libglabels/tmpl/xml.sgml
+M      glabels2/libglabels/xml.c
+D      glabels2/missing
+
+commit bf335f6190c755edecd76daa222ddf818c3962f7
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-03-23
+
+    2005-03-22 Jim Evins  <evins@snaught.com>
+
+       Since the development version now requires gtk-2.6/gnome-2.10, I
+       have made a first pass at removing deprecations.
+
+       * configure.in:
+       * libglabels/Makefile.am:
+       * src/Makefile.am:
+               Added configure option to turn on X_DISABLE_DEPRECATED
+               flags.
+               Also removed all remnants of HAVE_FILECHOOSER.
+       * src/file.c: (gl_file_open_real):
+               Removed code for old GtkFileSelection.
+       * libglabels/libglabels-private.h:
+       * libglabels/paper.c:
+       * libglabels/template.c:
+       * libglabels/xml-paper.c:
+       * libglabels/xml-template.c:
+       * libglabels/xml.c:
+       * src/bc.c:
+       * src/file.c:
+       * src/glabels-batch.c:
+       * src/glabels.c:
+       * src/label.c:
+       * src/merge-init.c:
+       * src/merge-properties-dialog.c:
+       * src/merge.c:
+       * src/object-editor.c:
+       * src/prefs-dialog.c:
+       * src/prefs.c:
+       * src/print-dialog.c:
+       * src/print.c:
+       * src/stock.c:
+       * src/template-designer.c:
+       * src/ui-property-bar.c:
+       * src/ui-sidebar.c:
+       * src/view-barcode.c:
+       * src/view-box.c:
+       * src/view-ellipse.c:
+       * src/view-image.c:
+       * src/view-line.c:
+       * src/view-text.c:
+       * src/view.c:
+       * src/wdgt-image-select.c:
+       * src/wdgt-media-select.c:
+       * src/wdgt-print-copies.c:
+       * src/wdgt-print-merge.c:
+       * src/wdgt-rotate-label.c:
+       * src/window.c:
+       * src/xml-label-04.c:
+       * src/xml-label-191.c:
+       * src/xml-label.c:
+               Added '#include <glib/gi18n.h>" where needed.
+               Removed any unused '#include <gnome.h>"s.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@509
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/libglabels-private.h
+M      glabels2/libglabels/paper.c
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/libglabels/xml.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/bc.c
+M      glabels2/src/file.c
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label.c
+M      glabels2/src/merge-init.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/stock.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-image-select.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/window.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit c5beb442f3f9bb114d6da1e6bc47785cff1e3e9c
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-03-23
+
+    2005-03-22 Jim Evins  <evins@snaught.com>
+
+       * src/commands.c: (activate_url), (gl_cmd_help_about):
+               Replaced GnomeAbout with GtkAboutDialog.  Therefore the
+               development version of glabels now depends on GTK 2.6 and
+               GNOME 2.10.
+       * configure.in:
+               Updated library dependencies.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@508
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/commands.c
+
+commit 578df4908bb69264be20b4e887782ff1276bb2e8
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-03-01
+
+    2005-02-28 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/templates/misc-iso-templates.xml:
+               Added 'Ednet 45021' template provided by Ali Akcaagac
+               <aliakc@web.de>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@507
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/templates/misc-iso-templates.xml
+
+commit 25516165e852af71671d740a8d9ed003ca7846ae
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-02-15
+
+    2005-02-14 Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+               Updated templates to use inches instead of points.
+       * src/print-dialog.c: (printer_page_new):
+               Changed packing style when adding printer selector widget.
+               This fixes
+               debian Bug#295274.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@504
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/templates/avery-us-templates.xml
+M      glabels2/src/print-dialog.c
+
+commit 7acfd66581cd73e6bf1fa7db370be984ecc1df9e
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-02-13
+
+    2005-02-13 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * po/es.po:
+               Updated spanish translations. (sergio rivadero)
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@502
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/po/es.po
+
+commit 46b4d3627f3a1af503c1433286dbe78c7e7f2d09
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-02-06
+
+    2005-02-05 Jim Evins  <evins@snaught.com>
+
+       Some cleanup to libglabels.
+
+       * configure.in:
+               Updated version to 2.1.1cvs.  Added generation of
+               libglabels.pc.
+       * libglabels/libglabels.pc.in
+               Created.
+       * libglabels/enums.h
+               Created.  Currently only contains glUnitsType which
+               provides enumerations
+               for all possible units of distance.
+       * libglabels/Makefile.am:
+               Incorporated new files enums.h and libglabels.pc[.in].
+       * libglabels/libglabels.h:
+               Include enums.h.
+       * libglabels/template.h:
+       * libglabels/template.c: (gl_template_layout_new):
+               Changed parameters nx and ny to gint from gdouble.
+       * libglabels/xml.h:
+       * libglabels/xml.c: (gl_xml_get_prop_length),
+       (gl_xml_set_prop_length), (gl_xml_set_default_units):
+               Added support for different output units.
+       * src/prefs-dialog.c: (update_locale_page_from_prefs),
+       (update_prefs_from_locale_page):
+       * src/prefs-model.c: (string_to_units), (units_to_string):
+       * src/prefs-model.h:
+       * src/prefs.c: (gl_prefs_get_units_per_point),
+       (gl_prefs_get_units_precision), (gl_prefs_get_units_step_size),
+       (gl_prefs_get_units_string):
+       * src/prefs.h:
+       * src/wdgt-media-select.c: (details_update),
+       (get_label_size_desc):
+               Reconciled all length enumerations with the new
+               enumerations provided
+               in libglabels/enums.h.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@501
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/libglabels/Makefile.am
+C066   glabels2/libglabels/libglabels.h
+glabels2/libglabels/enums.h
+M      glabels2/libglabels/libglabels.h
+A      glabels2/libglabels/libglabels.pc.in
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml.c
+M      glabels2/libglabels/xml.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/wdgt-media-select.c
+
+commit 80c6dfde91a3ca72b4015c50ecebb7898fc474ae
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-02-04
+
+    2005-02-03 Jim Evins  <evins@snaught.com>
+
+       * po/cs.po:
+               Updated Czech translations. (David Makovský and Zbynek
+               Mrkvick)
+       * po/it.po:
+               Updated Italian translations. (Daniele Medri)
+       * AUTHORS:
+               Updated credits to reflect above translations.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@500
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/po/cs.po
+M      glabels2/po/it.po
+
+commit d4cb26542c64b720aa718adb1aacde180d9f8b32
+Author: Jim Evins <evins@snaught.com>
+Date:  2005-01-22
+
+    2005-01-22 Jim Evins  <evins@snaught.com>
+
+       * MESSAGE-OF-DOOM:
+               Added.
+       * Makefile.am:
+               Added MESSAGE-OF-DOOM to EXTRA_DIST.
+       * NEWS:
+               Final prep for 2.1.0.
+       * configure.in:
+               Set version to 2.1.0.  Output MESSAGE-OF-DOOM.
+       * glabels.spec.in:
+               Added '--remove-original' flag to desktop-file-install,
+               so that there is
+               only one menu entry.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@497
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+A      glabels2/MESSAGE-OF-DOOM
+M      glabels2/Makefile.am
+M      glabels2/NEWS
+M      glabels2/configure.in
+M      glabels2/data/desktop/glabels.desktop.in
+M      glabels2/data/dtd/glabels-2.0.dtd
+M      glabels2/data/glade/object-editor.glade
+M      glabels2/data/man/glabels.1
+M      glabels2/data/mime/glabels.keys.in
+M      glabels2/data/pixmaps/Makefile.am
+M      glabels2/data/pixmaps/glabels-about-logo.png
+A      glabels2/data/pixmaps/glabels-application-x-glabels.png
+D      glabels2/data/pixmaps/glabels-icon.png
+R100   glabels2/data/pixmaps/glabels-logo.png
+glabels2/data/pixmaps/glabels-splash.png
+M      glabels2/data/pixmaps/glabels.png
+M      glabels2/data/templates/avery-iso-templates.xml
+M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/data/ui/glabels-ui.xml
+M      glabels2/glabels.spec.in
+D      glabels2/mkinstalldirs
+M      glabels2/po/fr.po
+M      glabels2/src/Makefile.am
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-line.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/splash.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/window.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit fb62736c8d9761183cc64ded63a9b5ff9fc5ae3d
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-22
+
+    2004-08-22 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * src/glabels-batch.c: (main):
+               Applied patch with minor mods to allow selecting merge
+               source and
+               crop-marks on glabels-batch's command line.  Original
+               patch provided by
+               José Dapena Paz <jdapena@igalia.com>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@461
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/src/glabels-batch.c
+
+commit 83246d813303e9b6459abad3ea7fa3367eac06c6
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-15
+
+    2004-08-15 Jim Evins  <evins@snaught.com>
+
+       * data/desktop/glabels.desktop.in:
+               - Added encoding line
+               - Removed period from comment
+               - Fixed Terminal line, changed "0" to "false"
+               - Added semicolen to Categories line
+       * po/ja.po:
+               - Made sure desktop.in comment string above still
+               translated properly
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@460
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/desktop/glabels.desktop.in
+M      glabels2/po/ja.po
+
+commit 968a16da88603023f7c7b5e526fd5a7a9099d94c
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-15
+
+    2004-08-14 Jim Evins  <evins@snaught.com>
+
+       * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node):
+       * libglabels/xml-template.c:
+       (gl_xml_template_parse_template_node):
+       * src/xml-label-191.c: (xml191_parse_sheet):
+               Fixed improper freeing of gettext strings.  Merged from
+               2.0.1.
+       * configure.in:
+               Reconciled libglabels versioning with 2.0.1.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@457
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/libglabels/xml-paper.c
+M      glabels2/libglabels/xml-template.c
+M      glabels2/src/xml-label-191.c
+
+commit abae8fc459f68745dbc6369fd5b71dffad62e256
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-14
+
+    2004-08-14 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Updated version to 2.1cvs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@452
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit 9f33ea2bb3803234511af8e7fbd454eacce42877
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-14
+
+    2004-08-14 Jim Evins  <evins@snaught.com>
+
+       * po/ja.po:
+               Updated 2.0.x translation by Takeshi AIHANA
+               <aihana@gnome.gr.jp>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@449
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/po/ja.po
+
+commit a5659c418bcd65d7435c3ce51613801a64d0ac1a
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-14
+
+    2004-08-14 Jim Evins  <evins@snaught.com>
+
+       Fixes for Bug #1008181.
+
+       * src/bc.c: (gl_barcode_default_digits):
+               Make a format of zero digits, harmless.
+       * src/xml-label.c: (xml_parse_object_barcode):
+               Set default value of the format property of barcode
+               objects to 10, not
+               zero.  This will prevent crashes when reading pre
+               2.0.x files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@448
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/bc.c
+M      glabels2/src/xml-label.c
+
+commit 342ce3d7a1b5dd0b214cafa5062b9822d171d959
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-09
+
+    2004-08-09 Jim Evins  <evins@snaught.com>
+
+           * NEWS:
+           * TODO:
+           * help/C/glabels-C.omf:
+           * help/C/glabels.xml:
+                   Brought documentation up-to-date for 2.0.0 release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@445
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/NEWS
+
+commit 02bee8734212c7fd340a00788764001f698bab05
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-09
+
+    2004-08-09 Jim Evins  <evins@snaught.com>
+
+       * NEWS:
+       * TODO:
+       * help/C/glabels-C.omf:
+       * help/C/glabels.xml:
+               Brought documentation up-to-date for 2.0.0 release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@444
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/NEWS
+M      glabels2/TODO
+M      glabels2/help/C/glabels-C.omf
+M      glabels2/help/C/glabels.xml
+
+commit 356e6b3d52372448409a359f07ad04c73fa35a82
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-09
+
+    2004-08-09 Jim Evins  <evins@snaught.com>
+
+       These are hopefully the final preparations for 2.0.0.
+
+       * data/mime/Makefile.am:
+               Include glabels.xml in EXTRA_DIST.
+       * configure.in:
+               - Updated comment style.
+               - Added LIBGLABELS_VERSION_INFO macro, updated Current.
+               - Added package and version info to configuration printout
+               - Update version to 2.0.0
+       * libglabels/Makefile.am:
+               Use the new LIBGLABELS_VERSION_INFO macro.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@443
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/data/mime/Makefile.am
+M      glabels2/libglabels/Makefile.am
+
+commit db1a07eb0f330390e2b7fd6f4d82647f076a307d
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-09
+
+    2004-08-09 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * glabels.spec.in:
+               Cleanup of required library macros.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@442
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/glabels.spec.in
+
+commit 7427f8f1bced3e4bc465d0d0492019435193d9d0
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-08
+
+    2004-08-08 Jim Evins  <evins@snaught.com>
+
+       * glabels.spec.in:
+               - Updated URL
+               - More specific of what to install in /usr/bin and
+               /usr/lib
+               - Remove built mime registration files from staging
+               directory
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@441
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/glabels.spec.in
+
+commit 4f4f868eade0e1e5f9c6c8640cc424a209e930ea
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-08
+
+    2004-08-08 Jim Evins  <evins@snaught.com>
+
+       * data/mime/Makefile.am:
+               Fixed typo:  key_files should have been keys_files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@440
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/mime/Makefile.am
+
+commit 3470ca951a824cee7a23eec888299124eed6eb13
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-08
+
+    2004-08-08 Jim Evins  <evins@snaught.com>
+
+       Reorganization of runtime data files.  Also added registration
+       of mimetype with
+       new freedesktop.org mime database if available.
+
+       * data/*
+               Moved files to appropriate subdirectories, creating
+               local Makefile.am
+               in each subdirectory.
+               - Moved paper-sizes.xml and *-templates.xml to templates
+               subdirectory.
+                 These are now installed at $datadir/glabels/templates.
+               - Moved glabels.1 to man subdirectory.
+               - Moved glabels-2.0.dtd to dtd subdirectory.
+               - Moved glabels.desktop.in to desktop subdirectory.
+               - Moved glabels.keys.in and glabels.mime to mime
+               subdirectory.
+       * data/pixmaps/*
+               Moved "./pixmaps" to "./data/pixmaps"
+       * data/ui/*
+               Moved src/glabels-ui.xml to data/ui directory. Created
+               Makefile.am.
+       * data/glade/*
+               Moved libglade files from src to data/glade. Created
+               Makefile.am.
+       * Makefile.am:
+               Removed pixmaps from SUBDIRS.
+       * configure.in:
+               - Removed pixmaps from makefiles.
+               - Added makefiles for new subdirs of data.
+               - Added tests for freedesktop.org mime database.
+       * glabels.spec.in:
+               - Added tests for freedesktop.org mime database for post
+               install and
+                 post un-install actions.
+       * libglabels/Makefile.am:
+               Moved system template files to
+               $(datadir)/glabels/templates.
+       * libglabels/libglabels-private.h:
+               Moved system template files to
+               $(datadir)/glabels/templates.
+       * po/POTFILES.in:
+               - Accounted for movement of ui and libglade files.
+               - Added missing .in files.
+               - Reorganized by directory.
+       * src/Makefile.am:
+               Accounted for movement of ui and libglade files.
+       * data/mime/glabels.xml.in:
+               New file for registering with freedesktop.org mime
+               database.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@439
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+M      glabels2/data/Makefile.am
+A      glabels2/data/desktop/Makefile.am
+A      glabels2/data/desktop/glabels.desktop.in
+A      glabels2/data/dtd/Makefile.am
+R100   glabels2/data/glabels-2.0.dtd   glabels2/data/dtd/glabels-2.0.dtd
+D      glabels2/data/glabels.desktop.in
+A      glabels2/data/glade/Makefile.am
+R100   glabels2/src/object-editor.glade
+glabels2/data/glade/object-editor.glade
+R100   glabels2/src/prefs-dialog.glade
+glabels2/data/glade/prefs-dialog.glade
+R100   glabels2/src/template-designer.glade
+glabels2/data/glade/template-designer.glade
+A      glabels2/data/man/Makefile.am
+R100   glabels2/data/glabels.1 glabels2/data/man/glabels.1
+A      glabels2/data/mime/Makefile.am
+R100   glabels2/data/glabels.applications
+glabels2/data/mime/glabels.applications
+R090   glabels2/data/glabels.keys.in   glabels2/data/mime/glabels.keys.in
+R100   glabels2/data/glabels.mime      glabels2/data/mime/glabels.mime
+A      glabels2/data/mime/glabels.xml.in
+R100   glabels2/pixmaps/Makefile.am    glabels2/data/pixmaps/Makefile.am
+R100   glabels2/pixmaps/ex-1layout.png
+glabels2/data/pixmaps/ex-1layout.png
+R100   glabels2/pixmaps/ex-2layouts.png
+glabels2/data/pixmaps/ex-2layouts.png
+R100   glabels2/pixmaps/ex-cd-size.png
+glabels2/data/pixmaps/ex-cd-size.png
+R100   glabels2/pixmaps/ex-rect-size.png
+glabels2/data/pixmaps/ex-rect-size.png
+R100   glabels2/pixmaps/ex-round-size.png
+glabels2/data/pixmaps/ex-round-size.png
+R057   glabels2/pixmaps/glabels-about-logo.png
+glabels2/data/pixmaps/glabels-about-logo.png
+R100   glabels2/pixmaps/glabels-icon.png
+glabels2/data/pixmaps/glabels-icon.png
+A      glabels2/data/pixmaps/glabels-logo.png
+R100   glabels2/pixmaps/glabels.png    glabels2/data/pixmaps/glabels.png
+A      glabels2/data/templates/Makefile.am
+R100   glabels2/data/avery-iso-templates.xml
+glabels2/data/templates/avery-iso-templates.xml
+R100   glabels2/data/avery-other-templates.xml
+glabels2/data/templates/avery-other-templates.xml
+R100   glabels2/data/avery-us-templates.xml
+glabels2/data/templates/avery-us-templates.xml
+R100   glabels2/data/misc-iso-templates.xml
+glabels2/data/templates/misc-iso-templates.xml
+R100   glabels2/data/misc-other-templates.xml
+glabels2/data/templates/misc-other-templates.xml
+R100   glabels2/data/misc-us-templates.xml
+glabels2/data/templates/misc-us-templates.xml
+R100   glabels2/data/paper-sizes.xml
+glabels2/data/templates/paper-sizes.xml
+R100   glabels2/data/zweckform-iso-templates.xml
+glabels2/data/templates/zweckform-iso-templates.xml
+A      glabels2/data/ui/Makefile.am
+R100   glabels2/src/glabels-ui.xml     glabels2/data/ui/glabels-ui.xml
+M      glabels2/glabels.spec.in
+M      glabels2/libglabels/Makefile.am
+M      glabels2/libglabels/libglabels-private.h
+D      glabels2/pixmaps/glabels-logo.png
+M      glabels2/po/POTFILES.in
+M      glabels2/po/cs.po
+M      glabels2/po/de.po
+M      glabels2/po/es.po
+M      glabels2/po/fr.po
+M      glabels2/po/it.po
+M      glabels2/po/ja.po
+M      glabels2/po/pl.po
+M      glabels2/po/pt_BR.po
+M      glabels2/po/ru.po
+M      glabels2/po/zh_TW.Big5.po
+M      glabels2/src/Makefile.am
+
+commit d4ecd627e9dbeb831a9751c67d3e4bd983f73ccd
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-07
+
+    2004-08-07 Jim Evins  <evins@snaught.com>
+
+       * src/recent-files/*:
+               Re-synced to latest libegg/recent-files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@438
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/recent-files/Makefile.am
+M      glabels2/src/recent-files/egg-recent-item.c
+M      glabels2/src/recent-files/egg-recent-item.h
+M      glabels2/src/recent-files/egg-recent-model.c
+M      glabels2/src/recent-files/egg-recent-util.c
+D      glabels2/src/recent-files/egg-recent-vfs-utils.c
+D      glabels2/src/recent-files/egg-recent-vfs-utils.h
+M      glabels2/src/recent-files/egg-recent-view-gtk.c
+M      glabels2/src/recent-files/egg-recent-view.h
+A      glabels2/src/recent-files/egg-recent.h
+
+commit dcfe50a8208c3959e1b0313fd92619fe754a945a
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-07
+
+    2004-08-07 Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+       * configure.in:
+       * help/*
+               Renamed "./doc" directory to "./help" which contains
+               user documentation,
+               to be more consistent with other GNOME applications.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@437
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/help/C/Makefile.am
+A      glabels2/help/C/figures/glabels-template-cd.png
+A      glabels2/help/C/figures/glabels-template-label.png
+A      glabels2/help/C/figures/glabels-template-layout.png
+A      glabels2/help/C/figures/main-window-empty.png
+A      glabels2/help/C/figures/object-editor-sidebar.png
+A      glabels2/help/C/figures/print-copies.png
+A      glabels2/help/C/figures/print-merge.png
+A      glabels2/help/C/glabels-C.omf
+A      glabels2/help/C/glabels.xml
+A      glabels2/help/C/legal.xml
+A      glabels2/help/Makefile.am
+
+commit a1220b934f65cb92dc9f70f4a56202f5dcc990c3
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-08-07
+
+    2004-08-07 Jim Evins  <evins@snaught.com>
+
+       * Makefile.am:
+       * configure.in:
+       * help/*
+               Renamed "./doc" directory to "./help" which contains
+               user documentation,
+               to be more consistent with other GNOME applications.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@436
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+
+commit 1e4aa252e63eda3a5c119028baebe5b8d76fcbf5
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-26
+
+    2004-07-26 Jim Evins  <evins@snaught.com>
+
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_init):
+               Corrected button order of merge properties dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@435
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/merge-properties-dialog.c
+
+commit e84ded9f15e286b712ea5d1f876eed9e5d45c563
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-18
+
+    2004-07-18 Jim Evins  <evins@snaught.com>
+
+       * data/glabels-2.0.dtd:
+       * src/bc.c: (gl_barcode_default_digits),
+       (gl_barcode_can_freeform),
+       (gl_barcode_get_prefered_n):
+       * src/bc.h:
+       * src/label-barcode.c: (copy), (gl_label_barcode_set_props),
+       (gl_label_barcode_get_props), (get_size):
+       * src/label-barcode.h:
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page),
+       (style_changed_cb), (gl_object_editor_set_bc_style),
+       (gl_object_editor_get_bc_style):
+       * src/object-editor-data-page.c: (data_radio_toggled_cb),
+       (gl_object_editor_set_data), (gl_object_editor_get_data):
+       * src/object-editor-private.h:
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+       * src/object-editor.glade:
+       * src/object-editor.h:
+       * src/print.c: (draw_barcode_object):
+       * src/view-barcode.c: (update_object_from_editor_cb),
+       (update_editor_from_object_cb),
+       (gl_view_barcode_create_event_handler), (draw_barcode):
+       * src/xml-label-04.c: (xml04_parse_barcode_props):
+       * src/xml-label-191.c: (xml191_parse_barcode_props):
+       * src/xml-label.c: (xml_parse_object_barcode),
+       (xml_create_object_barcode):
+               Added "format" attribute to barcode objects.
+               This attribute is used
+               to properly format freeform barcodes barcodes prior to
+               merge data is
+               applied, so that barcodes can be accurately layed out.
+               This addresses
+               remaining issues of feature request #824787.  Also added
+               an example of
+               the format in the object editor.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@434
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/object-editor.h
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit fe42d658938053fa034ba7b8e56e3d6b5ba098ca
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-12
+
+    2004-07-12 Jim Evins  <evins@snaught.com>
+
+       Various code cleanups.
+
+       * src/label-barcode.c:
+               Removed unneeded include of gnome-glyphlist.h.
+
+       * src/label-text.c: (get_size):
+               Fixed memory leak: unref glyphlists when done with them.
+
+       * src/object-editor-bc-page.c: (gl_object_editor_prepare_bc_page):
+       * src/object-editor-data-page.c:
+       (gl_object_editor_prepare_data_page):
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_prepare_line_page):
+       * src/object-editor-lsize-page.c:
+       (gl_object_editor_prepare_lsize_page):
+       * src/object-editor-position-page.c:
+       (gl_object_editor_prepare_position_page):
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page):
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page):
+               Removed unneeded size groups, originally intended to
+               keep widgets aligned.
+               Now use tables to lay these out in object-editor.glade.
+
+       * src/print.c: (draw_text_object):
+               Fixed memory leak: unref glyphlists when done with them.
+
+       * src/view-barcode.c: (draw_barcode):
+               Fixed memory leak: unref glyphlists when done with them.
+
+       * src/view-text.c: (update_object_from_editor_cb),
+       (draw_hacktext):
+               - Removed unneeded cast of
+               gl_object_editor_get_text_line_spacing()s
+                 return value.
+               - Fixed memory leak: unref glyphlists when done with them.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@433
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-data-page.c
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/object-editor-line-page.c
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-text.c
+
+commit 00ddb9df4fe9f2ae732a5561ea7b8867aa8433d4
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-12
+
+    2004-07-11 Jim Evins  <evins@snaught.com>
+
+       * data/glabels-2.0.dtd:
+       * src/label-text.c: (gl_label_text_instance_init), (copy),
+       (gl_label_text_set_auto_shrink), (gl_label_text_get_auto_shrink):
+       * src/label-text.h:
+       * src/object-editor-private.h:
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_text_auto_shrink),
+       (gl_object_editor_get_text_auto_shrink):
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+       * src/object-editor.glade:
+       * src/object-editor.h:
+       * src/print.c: (draw_text_object):
+       * src/view-text.c: (update_object_from_editor_cb),
+       (update_editor_from_object_cb):
+       * src/xml-label.c: (xml_parse_object_text),
+       (xml_create_object_text):
+               Added option to allow document merge to auto shrink text
+               size to fit
+               within the text box.  The code in print.c that actually
+               shrinks the
+               text is loosely based on a patch submitted by Mark
+               Harrison
+               <mark.harrison@velocitynet.com.au>.  This addresses
+               feature request
+               #661421.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@432
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/object-editor.h
+M      glabels2/src/print.c
+M      glabels2/src/view-text.c
+M      glabels2/src/xml-label.c
+
+commit 1fd401c400027d08f75b0a1105a47ba3b416e193
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-11
+
+    2004-07-11 Jim Evins  <evins@snaught.com>
+
+       * data/glabels-2.0.dtd:
+       * libglabels/template.c: (gl_template_rect_label_type_new),
+       (gl_template_round_label_type_new),
+       (gl_template_cd_label_type_new), (gl_template_label_type_dup),
+       (template_full_page):
+       * libglabels/template.h:
+       * libglabels/xml-template.c: (xml_parse_label_rectangle_node),
+       (xml_create_label_node):
+       * pixmaps/ex-rect-size.png:
+       * src/print.c: (clip_to_outline), (clip_punchouts):
+       * src/template-designer.c: (construct_rect_size_page),
+       (rect_size_page_prepare_cb), (layout_page_prepare_cb),
+       (build_template):
+       * src/template-designer.glade:
+       * src/xml-label-191.c: (xml191_parse_label):
+               Modifications to allow separate horizontal (x_waste)
+               and vertical (y_waste)
+               properties for rectangular labels.  Templates remain
+               backwards compatible,
+               but this breaks the libglabels API (I don't know of
+               anyone outside of
+               glabels using libglabels at this time -- what can I say,
+               the program is
+               is still "unstable").  This addresses the suggestion in
+               Feature Request
+               #976313.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@431
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/libglabels/template.c
+M      glabels2/libglabels/template.h
+M      glabels2/libglabels/xml-template.c
+M      glabels2/pixmaps/ex-rect-size.png
+M      glabels2/src/print.c
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.glade
+M      glabels2/src/xml-label-191.c
+
+commit e2bb3e9baa9e37d525cd36408dcc5ef1c9008bcd
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-06
+
+    2004-07-05 Jim Evins  <evins@snaught.com>
+       * src/print.c: (print_crop_marks), (draw_outline):
+               Changed crop marks and label outlines to black, instead
+               of 25% gray.
+               This addresses debian Bug #257460.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@430
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/print.c
+
+commit 64e93eac58ec9545c3896e271ce3b78f23ebea26
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-05
+
+    2004-07-05 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-fill-page.c:
+       (gl_object_editor_set_fill_color):
+       * src/object-editor-line-page.c:
+       (gl_object_editor_set_line_color):
+               Preserve "is_default" of fill and line color_combos when
+               creating from
+               existing objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@429
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-fill-page.c
+M      glabels2/src/object-editor-line-page.c
+
+commit 6ebd01b8a785ff3e49fafa0e0f94369ac9f95ca1
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-02
+
+    2004-07-02 Jim Evins  <evins@snaught.com>
+
+       * data/glabels.1:
+               Created man page.  Based on page submitted by Matthew
+               J. Lockner, however
+               it has been severely edited.
+
+       * data/avery-other-templates.xml
+       * data/misc-other-templates.xml:
+               Started new files for predefined templates with
+               non-standard sheet sizes.
+               These have been initially populated with the Avery
+               06141 and
+               OfficeMax #86112, both provided by Matthew J. Lockner.
+
+       * data/Makefile.am:
+               Install above manpage and template files.
+
+       * glabels.spec.in:
+               Make sure we install man pages.
+
+       * src/glabels-batch.c:
+               Changed short form of help option to '-?' to be consistent
+               with glabels.
+
+       * AUTHORS:
+               Added acknowledgement for above labels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@428
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/Makefile.am
+A      glabels2/data/avery-other-templates.xml
+A      glabels2/data/glabels.1
+A      glabels2/data/misc-other-templates.xml
+M      glabels2/glabels.spec.in
+M      glabels2/src/glabels-batch.c
+
+commit d64bd058272ae98ad15f2995edddeb8570d2b64d
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-07-02
+
+    2004-07-02 Jim Evins  <evins@snaught.com>
+
+       * src/glabels.c: (main), (save_session_cb):
+               - Now include libbonoboui.h, recent.h, and file.h to
+               provide missing
+                 prototypes.
+               - save_session_cb() now returns gboolean.
+               - Minor formatting changes.
+
+       * src/window.h:
+       * src/window.c:
+               - Now include file.h to provide missing prototype.
+               - gl_window_get_type() now returns GType, not guint.
+               I believe this may
+                 ultimately be cause of the segfault reported in Bug
+                 #982287, since
+                 GType is actually a gulong, which may not be compatible
+                 on other
+                 architectures (64bit) -- I cannot personally test this
+                 at this time.
+                 I was sloppy in several other xxx_get_type() functions
+                 which also
+                 returned guint -- see next group of files:
+
+       * src/window.c: (gl_window_get_type):
+       * src/canvas-hacktext.c: (gl_canvas_hacktext_get_type):
+       * src/canvas-hacktext.h:
+       * src/hig.c: (gl_hig_alert_get_type), (gl_hig_dialog_get_type),
+       (gl_hig_category_get_type), (gl_hig_vbox_get_type),
+       (gl_hig_hbox_get_type):
+       * src/hig.h:
+       * src/label-barcode.c: (gl_label_barcode_get_type):
+       * src/label-barcode.h:
+       * src/label-box.c: (gl_label_box_get_type):
+       * src/label-box.h:
+       * src/label-ellipse.c: (gl_label_ellipse_get_type):
+       * src/label-ellipse.h:
+       * src/label-image.c: (gl_label_image_get_type):
+       * src/label-image.h:
+       * src/label-line.c: (gl_label_line_get_type):
+       * src/label-line.h:
+       * src/label-object.c: (gl_label_object_get_type):
+       * src/label-object.h:
+       * src/label-text.c: (gl_label_text_get_type):
+       * src/label-text.h:
+       * src/label.c: (gl_label_get_type):
+       * src/label.h:
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_get_type):
+       * src/merge-properties-dialog.h:
+       * src/merge-text.c: (gl_merge_text_get_type):
+       * src/merge-text.h:
+       * src/merge.c: (gl_merge_get_type):
+       * src/merge.h:
+       * src/object-editor.c: (gl_object_editor_get_type):
+       * src/prefs-dialog.c: (gl_prefs_dialog_get_type):
+       * src/prefs-dialog.h:
+       * src/prefs-model.c: (gl_prefs_model_get_type):
+       * src/prefs-model.h:
+       * src/print-dialog.c: (gl_print_dialog_get_type):
+       * src/print-dialog.h:
+       * src/template-designer.c: (gl_template_designer_get_type):
+       * src/template-designer.h:
+       * src/ui-property-bar.c: (gl_ui_property_bar_get_type):
+       * src/ui-property-bar.h:
+       * src/ui-sidebar.c: (gl_ui_sidebar_get_type):
+       * src/ui-sidebar.h:
+       * src/view-barcode.c: (gl_view_barcode_get_type):
+       * src/view-barcode.h:
+       * src/view-box.c: (gl_view_box_get_type):
+       * src/view-box.h:
+       * src/view-ellipse.c: (gl_view_ellipse_get_type):
+       * src/view-ellipse.h:
+       * src/view-highlight.c: (gl_view_highlight_get_type):
+       * src/view-highlight.h:
+       * src/view-image.c: (gl_view_image_get_type):
+       * src/view-image.h:
+       * src/view-line.c: (gl_view_line_get_type):
+       * src/view-line.h:
+       * src/view-object.c: (gl_view_object_get_type):
+       * src/view-object.h:
+       * src/view-text.c: (gl_view_text_get_type):
+       * src/view-text.h:
+       * src/view.c: (gl_view_get_type):
+       * src/view.h:
+       * src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type):
+       * src/wdgt-image-select.c: (gl_wdgt_image_select_get_type):
+       * src/wdgt-image-select.h:
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_get_type):
+       * src/wdgt-media-select.h:
+       * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type):
+       * src/wdgt-mini-preview.h:
+       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type):
+       * src/wdgt-print-copies.h:
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type):
+       * src/wdgt-print-merge.h:
+       * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type):
+       * src/wdgt-rotate-label.h:
+               - Made sure all xxx_get_type functions returned GType,
+               not guint.  This
+                 was the case in hig.[ch], window.[ch],
+                 ui-property-bar.[ch],
+                 ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch],
+                 wdgt-media-select.[ch], wdgt-mini-preview.[ch],
+                 wdgt-print-copies.[ch],
+                 wdt-print-merge.[ch], and wdgt-rotate-label.[ch].
+                 See separate
+                 window.[ch] details above for more info.
+               - Reconciled various coding style differences in all
+               xxx_get_type()
+                 functions:
+                       * All prototypes include G_GNUC_CONST.
+                       * All prototypes specify the return value as
+                       GType, not GtkType
+                         or guint.
+                       * Info structures are all declared as "static
+                       const."
+                       * Generalized the names of type and info
+                       variables.
+                       * Miscelaneous formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@427
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/canvas-hacktext.h
+M      glabels2/src/glabels.c
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge-text.h
+M      glabels2/src/merge.c
+M      glabels2/src/merge.h
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.h
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/ui-sidebar.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-barcode.h
+M      glabels2/src/view-box.c
+M      glabels2/src/view-box.h
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-ellipse.h
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-highlight.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-image.h
+M      glabels2/src/view-line.c
+M      glabels2/src/view-line.h
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view-text.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-chain-button.c
+M      glabels2/src/wdgt-image-select.c
+M      glabels2/src/wdgt-image-select.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 8917cca244d9e34768af178a54238683ec8127e2
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-06-12
+
+    2004-06-08 Jim Evins  <evins@snaught.com>
+
+       * src/label.c:
+       * src/label.h:
+       * src/xml-label.c:
+       * AUTHORS:
+               Don't touch compression of original file -- still defaults
+               to 9 for
+               new files.  Original patch provided by Javier Donaire
+               Segarra
+               (#912252 in patch tracker).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@426
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+
+commit 7256870b60b9aa34b538a1d4b59fe455aefbcb29
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-06-08
+
+    Don't touch compression of original file -- still defaults to 9
+    for new files.  Original patch provided by Javier Donaire Segarra
+    (#912252 in patch tracker).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@425
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/xml-label.c
+
+commit 20808aa3eca1b58fd8a8818699ce6afeaaedea1c
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-05-06
+
+    2004-05-05 Jim Evins  <evins@snaught.com>
+
+           * data/glabels-2.0.dtd:
+                   Broke DTD previously when adding new barcode types
+                   that contain
+    a
+                   plus sign (+).  Simply changed the BC_STYLE_TYPE
+                   entity to "CDATA"
+                   to avoid the problem.
+           * data/avery-iso-templates.xml:
+           * data/zweckform-iso-templates.xml:
+           * AUTHORS:
+                   Added templates for Avery 7165, Zweckform 3688,
+                   4732, and 6021.
+     Templates
+                   provided by Frank Altpeter.
+           * libglabels/xml-template.c: (xml_create_label_node):
+                   Reordered markup and layout sub-nodes so that
+                   resulting templates will
+                   validate against DTD.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@424
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/avery-iso-templates.xml
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/data/zweckform-iso-templates.xml
+M      glabels2/libglabels/xml-template.c
+
+commit 9ddb032772f0b86540354e53e033a594a6e803d7
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-03-14
+
+    2004-03-13 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page):
+               Changed spin callback signals from "value-changed"
+               back to "changed."
+               This was accidentally introduced in a previous revision,
+               and can cause
+               size changes just by selecting the size tab.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@423
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-size-page.c
+
+commit 9d106262d34c861c16ad1d32bb410513b5e3d030
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-03-07
+
+    2004-03-06 Jim Evins  <evins@snaught.com>
+
+       * src/view.c: (draw_grid_layer):
+               For round labels (round and cd) adjust grid so that it
+               lines up with
+               center of label.  Also, no longer draw box around label
+               in the grid layer,
+               it is hidden by he fg layer anyway.  Feature suggested by
+               nemolivier@free.fr.  Although the grid is aligned with
+               the center of the
+               label, the coordinate system is still relative to the
+               upper left corner
+               of the rectangle containing the label.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@422
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view.c
+
+commit 60d890a26c81ee5fe3b6aeb587095ddc891d1871
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-26
+
+    2004-02-25 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Changed version to 2.0pre1cvs
+
+       * libglabels/xml-template.c:
+       (gl_xml_template_parse_templates_doc):
+               Removed extra xmlFreeDoc() calls upon error.  Also print
+               the doc->URL
+               instead of doc->name fields when errors encountered.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@421
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/libglabels/xml-template.c
+
+commit db892e05bdff8969d492480eaabfd53cc4d26e0e
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-21
+
+    2004-02-21 Jim Evins  <evins@snaught.com>
+
+       * data/avery-iso-templates.xml:
+               Added aliases for Avery 8651.  Patch provided by Wayne
+               Schuller.
+
+       * glabels.spec.in:
+               Added libglabels library and include file to installed
+               files.
+
+       * configure.in:
+               Final prep for 1.93.3.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@419
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/data/avery-iso-templates.xml
+M      glabels2/glabels.spec.in
+
+commit 02ab3e0ba36d0d0e212c49d536d9988b472433a5
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-21
+
+    2004-02-20 Jim Evins  <evins@snaught.com>
+
+       * src/glabels-batch.c: (main):
+               Changed key for setting output filename to
+               GNOME_PRINT_KEY_OUTPUT_FILENAME
+               as suggested by Javier Donaire Segarra.  This addresses
+               bug #901063.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@418
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/glabels-batch.c
+
+commit 5f4d73307100027c51108750bc00fd0245898f90
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-17
+
+    2004-02-16 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               If gtk+ >= 2.3.2 then define HAVE_FILE_CHOOSER.
+
+       * src/Makefile.am:
+               Added HAVE_FILE_CHOOSER to INCLUDES.
+
+       * src/file.c: (gl_file_open), (open_response),
+       (gl_file_open_real),
+       (gl_file_save_as), (save_as_response):
+               Ported to use GtkFileChooserDialog if HAVE_FILE_CHOOSER
+               is defined.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@417
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+
+commit 70ae1974aed8233b3ddf56987d2b39c14f49eec9
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-16
+
+    2004-02-16 Jim Evins  <evins@snaught.com>
+
+       * src/xml-label-04.c: (xml04_parse_image_props):
+       * src/xml-label-191.c: (xml191_parse_image_props):
+       * src/xml-label.c: (xml_parse_object_image):
+               Delay setting image size until after image has been
+               applied to new
+               object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@416
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 1793cb9fc61fe010218dc43b590c00387bad7f25
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-16
+
+    2004-02-15 Jim Evins  <evins@snaught.com>
+
+       * src/label-barcode.c: (gl_label_barcode_set_data),
+       (gl_label_barcode_set_props):
+               Don't emit "changed" signal, if no change actually made
+               for these
+               methods.  Reduces number of unnecessary redraws of
+               barcodes.
+
+       * src/label-object.h:
+       * src/label-object.c: (gl_label_object_set_position),
+       (gl_label_object_set_position_relative), (set_size),
+       (gl_label_object_set_size),
+       (gl_label_object_set_size_honor_aspect):
+               Don't emit "changed" signal, if no change actually made
+               for these
+               methods.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@415
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+
+commit c15370de048b1e46ae69459fc702fcd3c75b7810
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-15
+
+    2004-02-15 Jim Evins  <evins@snaught.com>
+
+       * data/glabels-2.0.dtd:
+               Added specific subtypes for various barcode types.
+
+       * src/bc.h:
+       * src/bc.c: (id_to_index), (name_to_index), (gl_barcode_new),
+       (gl_barcode_get_styles_list), (gl_barcode_default_digits),
+       (gl_barcode_can_text), (gl_barcode_text_optional),
+       (gl_barcode_can_csum), (gl_barcode_csum_optional),
+       (gl_barcode_id_to_name), (gl_barcode_name_to_id):
+               Changed API to use a string id, rather than a fixed
+               enumeration.  Id and
+               name are separate strings.  Added entries to backend
+               table for specific
+               subtypes for various barcode types.
+
+       * src/bc-postnet.h:
+       * src/bc-postnet.c: (gl_barcode_postnet_new), (postnet_code),
+       (is_length_valid):
+               Modified to conform to above API.  Now more stringent
+               with data length
+               for various subtypes.
+
+       * src/bc-gnubarcode.h:
+       * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new),
+       (is_length_valid), (is_length1_valid), (is_length2_valid):
+               Modified to conform to above API.  Now more stringent
+               with data length
+               for various subtypes.
+
+       * src/label-barcode.h:
+       * src/label-barcode.c: (copy), (gl_label_barcode_set_props),
+       (gl_label_barcode_get_props), (get_size):
+               Modified to use above API for storing barcode type.
+
+       * src/object-editor.h:
+       * src/object-editor-bc-page.c: (style_changed_cb),
+       (gl_object_editor_set_bc_style), (gl_object_editor_get_bc_style):
+               Modified to use above API for storing barcode type.
+
+       * src/object-editor-size-page.c:
+       (gl_object_editor_prepare_size_page), (aspect_toggle_cb),
+       (w_spin_cb), (h_spin_cb), (size_reset_cb):
+               Added debug markers.
+
+       * src/object-editor.glade:
+               Made barcode style combo's text entry  non-editable.
+
+       * src/print.c: (draw_barcode_object):
+               Modified to use above API for barcode type.
+
+       * src/view-barcode.c: (update_object_from_editor_cb),
+       (update_editor_from_object_cb),
+       (gl_view_barcode_create_event_handler), (draw_barcode):
+               Modified to use above API for barcode type.
+
+       * src/xml-label-04.c: (xml04_parse_barcode_props):
+       * src/xml-label-191.c: (xml191_parse_barcode_props):
+       * src/xml-label.c: (xml_parse_object_barcode),
+       (xml_create_object_barcode):
+               Modified to use above API for barcode type.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@414
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-gnubarcode.h
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc-postnet.h
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/object-editor-bc-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/object-editor.h
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 0f59322c3d8175fafb061e530a6b36c2e043b4ee
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-07
+
+    2004-02-07 Jim Evins  <evins@snaught.com>
+
+       * src/stock-pixmaps/Makefile.am:
+       * src/stock-pixmaps/stock_hchain_24.png:
+       * src/stock-pixmaps/stock_hchain_broken_24.png:
+       * src/stock-pixmaps/stock_vchain_24.png:
+       * src/stock-pixmaps/stock_vchain_broken_24.png:
+               Added chain pixmaps borrowed from the gimp's default
+               theme.
+
+       * src/stock.h:
+       * src/stock.c: (gl_stock_init), (add_button_icon):
+               Added above pixmaps to stock icon sets.  Created
+               add_button_icon() to
+               add these pixmaps sized as GTK_ICON_SIZE_BUTTON.
+
+       * src/wdgt-chain-button.h
+       * src/wdgt-chain-button.c
+       * src/Makefile.am:
+       * po/POTFILES.in:
+               Added this Modified version of gimpchainbutton widget,
+               borrowed from
+               the gimp.
+
+       * AUTHORS:
+               Added acknowledgements of the above borrowing from
+               the gimp.
+
+       * src/object-editor-size-page.c: (aspect_toggle_cb), (w_spin_cb),
+       (h_spin_cb):
+       * src/object-editor.c: (gl_object_editor_construct_chain_button):
+       * src/object-editor.glade:
+               Replaced the keep aspect ratio check box with the above
+               chain-button
+               widget.
+
+       * src/text-node.c: (gl_text_node_equal):
+       * src/text-node.h:
+               Added function gl_text_node_equal() to compare text_nodes.
+
+       * src/label-image.c: (gl_label_image_set_filename):
+               Replaced incomplete text_node comparison code with
+               invocation of
+               gl_text_node_equal.  This fixed the problem of not being
+               able to
+               resize an image using the object_editor if the aspect
+               ratio is not
+               locked.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@413
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/label-image.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_hchain_24.png
+A      glabels2/src/stock-pixmaps/stock_hchain_broken_24.png
+A      glabels2/src/stock-pixmaps/stock_vchain_24.png
+A      glabels2/src/stock-pixmaps/stock_vchain_broken_24.png
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+M      glabels2/src/text-node.c
+M      glabels2/src/text-node.h
+A      glabels2/src/wdgt-chain-button.c
+A      glabels2/src/wdgt-chain-button.h
+
+commit d7a5fdb634b821ba3ed2c99f90fab88b5c0aba80
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-05
+
+    2004-02-04 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page):
+               Track "changed" signal of pixmap entry's GtkEntry rather
+               than its
+               "activate" signal -- this catches all changes to the
+               entry rather than
+               just changes resulting from a browse, so one can easily
+               pull previous
+               entries from the history. (This change is marked below
+               on 2004-02-03,
+               but somehow never got checked in.)
+
+       * src/view-highlight.c: (sl_resize_event_handler),
+       (sr_resize_event_handler), (st_resize_event_handler),
+       (sb_resize_event_handler):
+               Side resize handles will now confirm the actual resize
+               that the object
+               accepted before adjusting position parameters.
+               Previously some interesting
+               things happened when resizing a barcode to its minimum
+               size.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@412
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-image-page.c
+M      glabels2/src/view-highlight.c
+
+commit b7270cca21f97c762f1a1ff50f63df7efc8b2c5c
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-04
+
+    2004-02-03 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-image-page.c:
+       (gl_object_editor_prepare_image_page):
+               Track "changed" signal of pixmap entry's GtkEntry rather
+               than its
+               "activate" signal -- this catches all changes to the
+               entry rather than
+               just changes resulting from a browse, so one can easily
+               pull previous
+               entries from the history.
+
+       * src/view-highlight.c: (tl_resize_event_handler),
+       (tr_resize_event_handler), (bl_resize_event_handler),
+       (br_resize_event_handler):
+               Allow control key to be dropped while dragging a corner
+               resize handle
+               without losing the aspect ratio lock.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@411
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/view-highlight.c
+
+commit 8d1652bfd6e74700063cdccb120693515c71e6ea
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-03
+
+    2004-02-02 Jim Evins  <evins@snaught.com>
+
+       * src/label-image.c: (gl_label_image_set_filename):
+               When setting a new filename adjust size such that the
+               aspect ratio of
+               the image is preserved using the current size as a
+               bounding box.
+
+       * src/view-image.c: (update_object_from_editor_cb):
+               When updating object from editor, feed back possible
+               size changes to
+               editor as a result of a possible change in image.
+
+       * src/object-editor-size-page.c: (size_reset_cb):
+               Fixed typo when blocking spin handlers.  If the base
+               size is larger than
+               the max size, treat max size as a bounding box while
+               keeping aspect
+               ratio.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@410
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-image.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/view-image.c
+
+commit 6c3073bcc36e8c9e2c46e743b48f559970a14e12
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-02-03
+
+    2004-02-02 Jim Evins  <evins@snaught.com>
+
+       * src/label-object.h:
+       * src/label-object.c: (gl_label_object_set_size),
+       (gl_label_object_set_size_honor_aspect):
+               Added gl_label_object_set_size_honor_aspect() which will
+               maintain the
+               current aspect ratio by modifying the supplied w or
+               h apropriately.
+
+       * src/view-highlight.c: (tl_resize_event_handler),
+       (tr_resize_event_handler), (bl_resize_event_handler),
+       (br_resize_event_handler):
+               Corner handles will now maintain the current aspect
+               ratio if the
+               control key is pressed while resizing.  This addresses
+               feature
+               request #816603.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@409
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/view-highlight.c
+
+commit 66a83b58e4427fffbb7181528d6754a31513de07
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-31
+
+    2004-01-31 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/avery-us-templates.xml:
+               Added entries for "LSK-3," "LSK-5," and "LSK-8."
+               Submitted by JBadger.
+
+       * libglabels/template.c: (read_template_files_from_dir):
+               Corrected problem with testing for extensions.
+
+       * src/object-editor.glade:
+               Corrected grouping of radio buttons in barcode data page.
+
+       * src/print.c: (draw_barcode_object):
+       * src/view-barcode.c: (draw_barcode):
+               Corrected problem with calculation of y_offset for
+               locating characters.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@408
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/avery-us-templates.xml
+M      glabels2/libglabels/template.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+
+commit 91acdb1f63c5e89de292e321ce93071488e11261
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-25
+
+    2004-01-24 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/avery-us-templates.xml:
+               Added Avery 5824, submitted by Fred Bacon.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@407
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/avery-us-templates.xml
+
+commit 9a42fd691a980f7735c152055f56e25c8d556a6e
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-21
+
+    2004-01-20 Jim Evins  <evins@snaught.com>
+
+       Catching up on a couple of backlogged user template submissions.
+
+       * data/avery-iso-templates.xml:
+               Added "DECAdry OLW-4731" and "DECAdry DLW-1731" aliases
+               for Avery 7160.
+               Suggested by Linas Jakucionis.
+
+       * data/zweckform-iso-templates.xml:
+               Added Zweckform 4760, submitted by Thomas Vill.
+
+       * AUTHORS:
+               Updated to reflect above submissions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@406
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/data/avery-iso-templates.xml
+M      glabels2/data/zweckform-iso-templates.xml
+
+commit e1a2cde6e4ffbe6938f93ae8629dc1f80d3a40fa
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-07
+
+    2004-01-06 Jim Evins  <evins@snaught.com>
+
+       Split-out template.[ch], paper.[ch], xml-template.[ch],
+       xml-paper.[ch], and
+       xml.[ch] into a separate library called libglabels, to facilitate
+       third
+       party use of glabels template files.  This was suggested by
+       Wayne Schuller.
+       Once split-out, some modifications to the structures and
+       functions to
+       make a cleaner more useful API, hopefully.  Rather extensive
+       changes have
+       propogated to other modules.
+
+       * src/paper.h:
+       * src/paper.c:
+       * src/template.h:
+       * src/template.c:
+       * src/xml-paper.h:
+       * src/xml-paper.c:
+       * src/xml-template.h:
+       * src/xml-template.c:
+       * src/xml.h:
+       * src/xml.c:
+               These files have been moved to libglabels/.  API cleanup
+               performed.
+
+       * libglabels/libglabels.h:
+       * libglabels/libglabels-private.h:
+       * libglabels/Makefile.am:
+               These files have been added to finish out libglabels.
+
+       * Makefile.am:
+       * configure.in:
+       * glabels.spec.in:
+       * po/POTFILES.in:
+       * src/Makefile.am:
+               Modified to reflect new sets of files in src/ and
+               libglabels/.
+
+       * COPYING.LIBGLABELS:
+       * COPYING-DOCS:
+               Added copy of the LGPL for libglabels, and a copy the
+               GFDL for
+               documentation.
+
+       * src/glabels-batch.c:
+       * src/glabels.c:
+       * src/label.c: (gl_label_finalize), (gl_label_set_template),
+       (gl_label_get_size):
+       * src/label.h:
+       * src/prefs-model.c: (gl_prefs_model_load_settings):
+       * src/print-dialog.c:
+       * src/print.c: (gl_print_simple), (gl_print_merge_collated),
+       (gl_print_merge_uncollated), (gl_print_batch), (print_info_free),
+       (print_crop_marks), (print_label), (draw_outline),
+       (clip_to_outline), (clip_punchouts):
+       * src/template-designer.c: (construct_pg_size_page),
+       (pg_size_page_changed_cb), (layout_page_changed_cb),
+       (print_test_cb), (build_template):
+       * src/util.c: (gl_util_fraction):
+       * src/util.h:
+       * src/view.c: (draw_bg_fg_layers), (draw_bg_fg_rect),
+       (draw_bg_fg_rounded_rect), (draw_bg_fg_round), (draw_bg_fg_cd),
+       (draw_bg_fg_cd_bc), (draw_markup_layer), (draw_markup_margin),
+       (draw_markup_margin_rect), (draw_markup_margin_rounded_rect),
+       (draw_markup_margin_round), (draw_markup_margin_cd),
+       (draw_markup_margin_cd_bc), (draw_markup_line),
+       (draw_markup_circle), (gl_view_copy):
+       * src/wdgt-media-select.c: (gl_wdgt_media_select_construct),
+       (page_size_entry_changed_cb), (details_update), (get_layout_desc),
+       (get_label_size_desc):
+       * src/wdgt-mini-preview.c:
+       (gl_wdgt_mini_preview_set_label_by_name), (mini_outline_list_new),
+       (cdbc_item):
+       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct):
+       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
+       * src/wdgt-rotate-label.c: (mini_preview_canvas_update),
+       (gl_wdgt_rotate_label_set_template_name), (cdbc_item):
+       * src/wdgt-rotate-label.h:
+       * src/xml-label-04.c: (xml04_parse_media_description):
+       * src/xml-label-191.c: (gl_xml_label_191_parse),
+       (xml191_parse_sheet), (xml191_parse_label), (xml191_parse_layout),
+       (xml191_parse_markup), (xml191_parse_alias):
+       * src/xml-label.c: (xml_doc_to_label), (xml_parse_label),
+       (xml_label_to_doc):
+               Various changes to accomodate new libglabels API.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@405
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/COPYING-DOCS
+A      glabels2/COPYING.LIBGLABELS
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+M      glabels2/configure.in
+M      glabels2/glabels.spec.in
+A      glabels2/libglabels/Makefile.am
+A      glabels2/libglabels/libglabels-private.h
+A      glabels2/libglabels/libglabels.h
+R066   glabels2/src/paper.c    glabels2/libglabels/paper.c
+A      glabels2/libglabels/paper.h
+A      glabels2/libglabels/template.c
+A      glabels2/libglabels/template.h
+A      glabels2/libglabels/xml-paper.c
+A      glabels2/libglabels/xml-paper.h
+A      glabels2/libglabels/xml-template.c
+A      glabels2/libglabels/xml-template.h
+R090   glabels2/src/xml.c      glabels2/libglabels/xml.c
+R064   glabels2/src/xml.h      glabels2/libglabels/xml.h
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+D      glabels2/src/paper.h
+M      glabels2/src/prefs-model.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/template-designer.c
+D      glabels2/src/template.c
+D      glabels2/src/template.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+D      glabels2/src/xml-paper.c
+D      glabels2/src/xml-paper.h
+D      glabels2/src/xml-template.c
+D      glabels2/src/xml-template.h
+
+commit 5a3bef4441d08531523c1939451fbbe8071e75cd
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-04
+
+    2004-01-03 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Release 1.93.2.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@403
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/configure.in
+
+commit a7899ecce3adcf1bc9fe4f59430acc35de88e2a8
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-04
+
+    2004-01-03 Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+               Added acknowledgement of contributions by Wayne Schuller.
+
+       * src/commands.c: (gl_cmd_file_print):
+               Create extra reference to print dialog, so that it can
+               be properly re-used.
+
+       * src/mygal/mygal-combo-box.h:
+       * src/mygal/mygal-combo-box.c:
+       (mygal_combo_box_popup_hide_unconditional),
+       (mygal_combo_box_popup_display), (mygal_combo_box_set_display),
+       (gtk_combo_set_tearoff_state), (mygal_combo_box_construct),
+       (mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title),
+       (mygal_combo_box_set_tearable):
+               Changed all occurances of GTK_IS_COMBO_BOX to
+               MYGAL_IS_COMBO_BOX, to
+               complete the rename of this widget to prevent namespace
+               collisions
+               with Gtk+-2.3.
+
+       * src/prefs-dialog.glade:
+               Fixed alignment of Fill/Color widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@402
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/ChangeLog
+M      glabels2/src/commands.c
+M      glabels2/src/mygal/mygal-combo-box.c
+M      glabels2/src/mygal/mygal-combo-box.h
+M      glabels2/src/prefs-dialog.glade
+
+commit 67b655a91bbe0c6173998617b4c1e83f3fb01eb1
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-04
+
+    2004-01-03 Jim Evins  <evins@snaught.com>
+
+       * data/avery-iso-templates.xml:
+               Added user submitted templates.
+               Avery 8435A & 8435B, submitted by Ludger Solbach.
+
+       * doc/C/glabels.xml:
+               Added minimal documentation, noting the new template
+               designer.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@401
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/avery-iso-templates.xml
+
+commit 827d4017d03dcece28006a5486674a8d4551ac29
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-03
+
+    2004-01-03 Jim Evins  <evins@snaught.com>
+
+       * pixmaps/ex-rect-size.png:
+       * pixmaps/ex-round-size.png:
+       * pixmaps/ex-cd-size.png:
+       * pixmaps/Makefile.am:
+               Added ex-rect-size.png, ex-round-size.png, and
+               ex-cd-size.png image
+               files to be used as illustrations/examples in the
+               template-designer.
+
+       * src/template-designer.c: (construct_rect_size_page),
+       (construct_round_size_page), (construct_cd_size_page),
+       (construct_nlayouts_page), (rect_size_page_prepare_cb),
+       (round_size_page_prepare_cb), (cd_size_page_prepare_cb),
+       (layout_page_prepare_cb), (build_template):
+       * src/template-designer.glade:
+               Added illustrations for rectangle, round, and cd label
+               size pages.
+               Added margin spinboxes to these pages, and now add a
+               margin markup
+               to the constructed template.  Added realistic default
+               values for
+               some of the size spinboxes.  Cleaned up the code for
+               setting spinbox
+               ranges on the layouts page.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@400
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/pixmaps/Makefile.am
+A      glabels2/pixmaps/ex-cd-size.png
+A      glabels2/pixmaps/ex-rect-size.png
+A      glabels2/pixmaps/ex-round-size.png
+M      glabels2/src/template-designer.c
+M      glabels2/src/template-designer.glade
+
+commit 7d0f397683e2a28806fd2cefce1d846a2064f186
+Author: Jim Evins <evins@snaught.com>
+Date:  2004-01-03
+
+    2004-01-02 Jim Evins  <evins@snaught.com>
+
+       * src/object-editor-size-page.c: (h_spin_cb):
+               Fixed cut-n-paste error in h_spin_cb that loaded h from
+               the wrong spinbutton.
+
+       * src/object-editor.h:
+       * src/object-editor.c: (gl_object_editor_class_init),
+       (gl_object_editor_changed_cb), (gl_object_editor_size_changed_cb):
+       * src/object-editor-private.h:
+       * src/object-editor-size-page.c: (w_spin_cb), (h_spin_cb),
+       (size_reset_cb):
+               Added "size_changed" signal.
+
+       * src/view-text.c: (construct_properties_editor),
+       (update_object_from_editor_cb),
+       (update_object_from_editor_size_cb):
+               Track size changes from object editor separately from
+               other
+               properties.  This is so the default size (0,0) of a text
+               object is not modified unintentionally.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@399
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/object-editor.h
+M      glabels2/src/view-text.c
+
+commit e4a19ad71c510363fa80e14c98f65c10a1f187ac
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-30
+
+    2003-12-30 Wayne Schuller  <k_wayne@linuxpower.org>
+
+       Added feature: line spacing - allows you to comfortably space
+       a text box to
+       fit a label perfectly.
+
+       * data/glabels-2.0.dtd:
+       * src/label-object.c: (gl_label_object_set_text_line_spacing),
+       (gl_label_object_get_text_alignment),
+       (gl_label_object_get_text_line_spacing):
+       * src/label-object.h:
+       * src/label-text.c: (gl_label_text_class_init),
+       (gl_label_text_instance_init), (copy), (get_size),
+       (set_text_line_spacing), (get_text_alignment),
+       (get_text_line_spacing):
+       * src/object-editor-private.h:
+       * src/object-editor-text-page.c:
+       (gl_object_editor_prepare_text_page),
+       (gl_object_editor_set_text_line_spacing),
+       (gl_object_editor_get_text_line_spacing):
+       * src/object-editor.glade:
+       * src/object-editor.h:
+       * src/prefs-dialog.c: (construct_object_page),
+       (update_object_page_from_prefs), (update_prefs_from_object_page):
+       * src/prefs-dialog.glade:
+       * src/prefs-model.c: (gl_prefs_model_save_settings),
+       (gl_prefs_model_load_settings), (get_float):
+       * src/prefs-model.h:
+       * src/print.c: (draw_text_object):
+       * src/ui-sidebar.c:
+       * src/view-text.c: (update_object_from_editor_cb),
+       (update_editor_from_object_cb),
+       (gl_view_text_create_event_handler), (draw_hacktext):
+       * src/view.c: (gl_view_construct),
+       (gl_view_set_selection_text_line_spacing),
+       (gl_view_set_default_text_line_spacing),
+       (gl_view_get_default_text_line_spacing):
+       * src/view.h:
+       * src/xml-label.c: (xml_parse_toplevel_span),
+       (xml_create_toplevel_span):
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@398
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-text-page.c
+M      glabels2/src/object-editor.glade
+M      glabels2/src/object-editor.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.glade
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/print.c
+M      glabels2/src/ui-sidebar.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/xml-label.c
+
+commit aa6be2ee3a8a2ca904810f4fde65721d68127093
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-30
+
+    2003-12-30 Jim Evins  <evins@snaught.com>
+
+       * src/template-designer.c:
+       * src/template-designer.h:
+       * src/template-designer.glade:
+               New template designer assistant.
+
+       * po/POTFILES.in:
+       * src/Makefile.am:
+               Added entries for src/template-designer.* files.
+
+       * pixmaps/ex-1layout.png
+       * pixmaps/ex-2layouts.png
+       * pixmaps/Makefile.am:
+               Added the new image files ex-*.png used as illustrations
+               in the
+               template designer assistant.
+
+       * src/print-dialog.h:
+       * src/print-dialog.c: (gl_print_dialog_finalize),
+       (gl_print_dialog_new), (gl_print_dialog_construct),
+       (gl_print_dialog_force_outline_flag):
+               Changed first argument of gl_print_dialog_new() from
+               glView to glLabel,
+               to support printing from the template designer assistant
+               which does not
+               have a full-fledged view.  Nothing else from the view
+               object was being
+               used by the dialog anyway.
+
+               Added the gl_print_dialog_force_outline_flag() method,
+               for better
+               integration with the template designer assistant.
+
+
+       * src/commands.h:
+       * src/commands.c: (gl_cmd_file_template_designer),
+       (gl_cmd_file_print):
+               Modified print command to provide label instead of view
+               to dialog.
+               Added the gl_cmd_file_template_designer() command to
+               invoke the
+               template designer assistant.
+
+       * src/ui.c:
+       * src/glabels-ui.xml:
+               Added support for template designer assistant.
+
+       * src/wdgt-mini-preview.h:
+       * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_set_template),
+       (gl_wdgt_mini_preview_set_bg_color):
+               Preview is now centered in canvas.  Added
+               gl_wdgt_mini_preview_set_bg_color() to allow the template
+               designer
+               assistant to match the background color with its own.
+
+       * src/print.c: (clip_to_outline):
+               Fixed really stupid bug when adding waste to clip region
+               of rectangular
+               labels/cards.  Each side of the clip region needs to be
+               extended by
+               twice the waste margin, as well as negatively offset by
+               the waste
+               margin.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@397
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/pixmaps/Makefile.am
+A      glabels2/pixmaps/ex-1layout.png
+A      glabels2/pixmaps/ex-2layouts.png
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/commands.c
+M      glabels2/src/commands.h
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/print.c
+A      glabels2/src/template-designer.c
+A      glabels2/src/template-designer.glade
+A      glabels2/src/template-designer.h
+M      glabels2/src/ui.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+
+commit 9b9df2809e35e02aa4c14ff05aaeb683b25c63c8
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-28 Jim Evins  <evins@snaught.com>
+
+       * src/prefs-dialog.c: (update_object_page_from_prefs):
+               Block intermediary function align_toggle_cb() instead of
+               update_prefs_from_object_page() for the three alignment
+               widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@396
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/prefs-dialog.c
+
+commit 94be7f87f0bce60192cf06eee6e10389a82c4e64
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-28 Wayne Schuller  <k_wayne@linuxpower.org>
+
+           * src/file.c: (gl_file_new), (gl_file_properties): Swap
+           button order and set default for higificatory pleasure.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@395
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/file.c
+
+commit 4af61cfcad47d9ba9940760116e139a337e0c301
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-27 Jim Evins  <evins@snaught.com>
+
+       * barcode-0.98/Makefile.am:
+               One last time:  removed doc/Makefile and po/Makefile.in.in
+               from
+               EXTRA_DIST files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@394
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/barcode-0.98/Makefile.am
+
+commit e896552f051622647d765aaaf8a753f883d65846
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-27 Jim Evins  <evins@snaught.com>
+
+       reviewed by: <delete if not using a buddy>
+
+       * barcode-0.98/Makefile.am:
+               Removed config.stat entry from EXTRA_DIST files.
+
+       * barcode-0.98/Makefile.in:
+               Removed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@393
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/barcode-0.98/Makefile.am
+D      glabels2/barcode-0.98/Makefile.in
+
+commit 6c7d8f20932bc80e2461d12fd2c4ea146fc9c510
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-27 Jim Evins  <evins@snaught.com>
+
+           * configure.in:
+                   Updated to work with latest gnome-common package
+                   from CVS.
+                   Removed recursive configuration of barcode-0.98.
+
+           * acconfig.h:
+           * macros/*:
+                   Removed.
+
+           * Makefile.am:
+                   Added barcode-0.98/ as a SUBDIR, and removed
+                   dist-hook.
+
+           * barcode-0.98/Makefile.in:
+           * barcode-0.98/configure.in:
+           * barcode-0.98/Makefile.am:
+           * barcode-0.98/README.glabels:
+                   Modified to ignore the barcode package's build system,
+                   and build
+                   as a part of glabels.
+                   Renamed Makefile.in to Makefile.in.dist.
+                   Renamed configure.in to configure.in.dist.
+                   Added barcode-0.98/Makefile.am and
+                   barcode-0.98/README.glabels.
+           * src/Makefile.am:
+           * src/mygal/Makefile.am:
+           * src/recent-files/Makefile.am:
+                   In order to build against the GNOME 2.5 platform,
+                   all use of *_DISABLE_DEPRECATED compile-time flags
+                   has been removed.
+
+           * src/mygal/Makefile.am:
+           * src/mygal/mygal-combo-box.c:
+           * src/mygal/mygal-combo-box.h:
+           * src/mygal/widget-color-combo.c:
+           * src/mygal/widget-color-combo.h:
+           * po/POTFILES.in:
+                   In order to build against the GNOME 2.5 platform,
+                   Renamed gtk_combo_box widget to mygal_combo_box,
+                   to prevent namespace
+                   collisions with the real gtk_combo_box widget,
+                   now a part of gtk.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@392
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/barcode-0.98/Makefile.am
+
+commit 0a403c6d9718254ea54850ef1d1f164c48da6b92
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-27 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Updated to work with latest gnome-common package from CVS.
+               Removed recursive configuration of barcode-0.98.
+
+       * acconfig.h:
+       * macros/*:
+               Removed.
+
+       * Makefile.am:
+               Added barcode-0.98/ as a SUBDIR, and removed dist-hook.
+
+       * barcode-0.98/Makefile.in:
+       * barcode-0.98/configure.in:
+       * barcode-0.98/Makefile.am:
+       * barcode-0.98/README.glabels:
+               Modified to ignore the barcode package's build system,
+               and build
+               as a part of glabels.
+               Renamed Makefile.in to Makefile.in.dist.
+               Renamed configure.in to configure.in.dist.
+               Added barcode-0.98/Makefile.am and
+               barcode-0.98/README.glabels.
+
+       * src/Makefile.am:
+       * src/mygal/Makefile.am:
+       * src/recent-files/Makefile.am:
+               In order to build against the GNOME 2.5 platform,
+               all use of *_DISABLE_DEPRECATED compile-time flags has
+               been removed.
+
+       * src/mygal/Makefile.am:
+       * src/mygal/mygal-combo-box.c:
+       * src/mygal/mygal-combo-box.h:
+       * src/mygal/widget-color-combo.c:
+       * src/mygal/widget-color-combo.h:
+       * po/POTFILES.in:
+               In order to build against the GNOME 2.5 platform,
+               Renamed gtk_combo_box widget to mygal_combo_box, to
+               prevent namespace
+               collisions with the real gtk_combo_box widget, now a
+               part of gtk.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@391
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels2/macros/Makefile.am
+D      glabels2/macros/aclocal-include.m4
+D      glabels2/macros/autogen.sh
+D      glabels2/macros/compiler-flags.m4
+D      glabels2/macros/curses.m4
+D      glabels2/macros/gnome-bonobo-check.m4
+D      glabels2/macros/gnome-common.m4
+D      glabels2/macros/gnome-cxx-check.m4
+D      glabels2/macros/gnome-fileutils.m4
+D      glabels2/macros/gnome-gettext.m4
+D      glabels2/macros/gnome-ghttp-check.m4
+D      glabels2/macros/gnome-gnorba-check.m4
+D      glabels2/macros/gnome-guile-checks.m4
+D      glabels2/macros/gnome-libgtop-check.m4
+D      glabels2/macros/gnome-objc-checks.m4
+D      glabels2/macros/gnome-orbit-check.m4
+D      glabels2/macros/gnome-pilot.m4
+D      glabels2/macros/gnome-print-check.m4
+D      glabels2/macros/gnome-pthread-check.m4
+D      glabels2/macros/gnome-support.m4
+D      glabels2/macros/gnome-undelfs.m4
+D      glabels2/macros/gnome-vfs.m4
+D      glabels2/macros/gnome-x-checks.m4
+D      glabels2/macros/gnome-xml-check.m4
+D      glabels2/macros/gnome.m4
+D      glabels2/macros/gperf-check.m4
+D      glabels2/macros/linger.m4
+D      glabels2/macros/need-declaration.m4
+D      glabels2/macros/psiconv.m4
+
+commit 374483b9c1e3bd3054a71d6b502c02218baee4c5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-28
+
+    2003-12-27 Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Updated to work with latest gnome-common package from CVS.
+               Removed recursive configuration of barcode-0.98.
+
+       * acconfig.h:
+       * macros/*:
+               Removed.
+
+       * Makefile.am:
+               Added barcode-0.98/ as a SUBDIR, and removed dist-hook.
+
+       * barcode-0.98/Makefile.in:
+       * barcode-0.98/configure.in:
+       * barcode-0.98/Makefile.am:
+       * barcode-0.98/README.glabels:
+               Modified to ignore the barcode package's build system,
+               and build
+               as a part of glabels.
+               Renamed Makefile.in to Makefile.in.dist.
+               Renamed configure.in to configure.in.dist.
+               Added barcode-0.98/Makefile.am and
+               barcode-0.98/README.glabels.
+
+       * src/Makefile.am:
+       * src/mygal/Makefile.am:
+       * src/recent-files/Makefile.am:
+               In order to build against the GNOME 2.5 platform,
+               all use of *_DISABLE_DEPRECATED compile-time flags has
+               been removed.
+
+       * src/mygal/Makefile.am:
+       * src/mygal/mygal-combo-box.c:
+       * src/mygal/mygal-combo-box.h:
+       * src/mygal/widget-color-combo.c:
+       * src/mygal/widget-color-combo.h:
+       * po/POTFILES.in:
+               In order to build against the GNOME 2.5 platform,
+               Renamed gtk_combo_box widget to mygal_combo_box, to
+               prevent namespace
+               collisions with the real gtk_combo_box widget, now a
+               part of gtk.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@390
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/Makefile.am
+D      glabels2/acconfig.h
+M      glabels2/barcode-0.98/Makefile.in
+C100   glabels2/barcode-0.98/Makefile.in
+glabels2/barcode-0.98/Makefile.in.dist
+A      glabels2/barcode-0.98/README.glabels
+R100   glabels2/barcode-0.98/configure.in
+glabels2/barcode-0.98/configure.in.dist
+M      glabels2/configure.in
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/mygal/Makefile.am
+D      glabels2/src/mygal/gtk-combo-box.h
+R080   glabels2/src/mygal/gtk-combo-box.c
+glabels2/src/mygal/mygal-combo-box.c
+A      glabels2/src/mygal/mygal-combo-box.h
+M      glabels2/src/mygal/widget-color-combo.c
+M      glabels2/src/mygal/widget-color-combo.h
+M      glabels2/src/recent-files/Makefile.am
+
+commit 0fc7cd31248b35914e681b37cd703f5366d88c76
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-27
+
+    2003-12-26 Jim Evins  <evins@snaught.com>
+
+       * src/paper.c:
+       * src/template.c:
+       * src/util.c:
+       * src/util.h:
+               Moved local versions of get_home_data_dir() in paper.c and
+               template.c to util package.  Cleaned up formatting in
+               util.[ch].
+
+       * src/template.c:
+               In gl_template_register() save a copy of the template in
+               ~/.glabels if the template is not known.  Still need to
+               handle duplicate filename case and duplicate name but
+               different template case.
+
+       * src/xml-label.c:
+       * src/xml.h:
+               Moved local definition of NAME_SPACE macro from
+               xml-label.c
+               to xml.h.
+
+       * src/xml-template.c:
+       * src/xml-template.h:
+               Added function gl_xml_template_write_template_to_file(),
+               used
+               in gl_template_register().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@389
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/ChangeLog
+M      glabels2/src/paper.c
+M      glabels2/src/template.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-template.c
+M      glabels2/src/xml-template.h
+M      glabels2/src/xml.h
+
+commit a155fb708375c1ed04bd184a45866ea1606a1831
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-26
+
+    Added user contributed template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@388
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/misc-iso-templates.xml
+
+commit ab07958f3b8f89b3c2c8be7f836217559aacbdef
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-26
+
+    Preparing for 1.93.2 development.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@387
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 33b3bebc5d206145cf608c7112ecf8b188ac0a1c
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-26
+
+    When looking up templates by name and name isn't found, return
+    first template instead of NULL (suggested by Wayne Schuller
+    <k_wayne@linuxpower.org>). In addition, added code to register
+    templates (make known, if not already known) when they are encountered
+    when reading a label.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@386
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/paper.c
+M      glabels2/src/paper.h
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit f1357e3a29e2b291c6574f49164497e046d2feab
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-23
+
+    Final prep for 1.93.1.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@384
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 5a3d0ee28811fc9ee872552cd7c29020f281bf21
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-23
+
+    Added scrollkeeper stuff.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@383
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/glabels.spec.in
+
+commit 8cf4bade5f2b17f356f7e8253ed89844035638eb
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-22
+
+    New user submitted template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@382
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/misc-iso-templates.xml
+
+commit 198fee144039f49f27295e518c0e2e115b07cd1d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-22
+
+    Changed some tabbed notebook labels to hopefully be more
+    understandable.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@381
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor.glade
+
+commit 2f77d3c19cd97dd2d55dd3bff8a4d5046ef6e2b6
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-21
+
+    In size_reset_cb() fixed broken, un-initialized, use of w_base
+    and h_base.  This was accidentally introduced when modified to
+    track gl_prefs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@380
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor-size-page.c
+
+commit be3625185312bb65c5538d3147ac8c2573eda437
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-20
+
+    Added skeletal xml documentation.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@379
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/omf.make
+A      glabels2/xmldocs.make
+
+commit c110ae640822b5be441c7ae3802a36b80e6c20ad
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-19
+
+    Fixed properties for text and linewidth spinbuttons.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@378
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor.glade
+M      glabels2/src/prefs-dialog.glade
+
+commit 44e32b0c46bf50195856ebc26b09fcb4f1f3da2a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-19
+
+    Created 2 methods for setting label for mini-preview widget.
+    The first is "by name" and the second is by template.   This second
+    method allows us to use a label's local template, even if its name
+    is not an exact match with an existing template's -- can occur if
+    templates are renamed between versions or if a label uses someone
+    else's custom template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@377
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+
+commit 00dd4521fae11dda1e5a53c5adb4edd044bb9689
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-17
+
+    Modifications to track properties of selected objects.
+    This addresses Bug #839801.  Patch provided by Emmanuel Pacaud
+    <emmanuel.pacaud@univ-poitiers.fr>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@376
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/mygal/widget-color-combo.c
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/ui-property-bar.h
+
+commit 768611c0fbde602b50f940ae142ee5eb3dc704db
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-14
+
+    Added src/prefs-model.[ch].
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@375
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 544b2c55be62f99f9a509d534c245c0551445c49
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-14
+
+    Added 2 user submitted templates.  Did a little cleanup of the
+    avery-iso and zweckform-iso files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@374
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/avery-iso-templates.xml
+M      glabels2/data/zweckform-iso-templates.xml
+
+commit 9485ecff9019ccd81087c0a65c99a006a7f0d761
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-14
+
+    Added menu entry to toggle visibility of property toolbar. Also added
+    entry to toggle its tooltips.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@373
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/prefs-model.c
+M      glabels2/src/prefs-model.h
+M      glabels2/src/ui.c
+
+commit d8c8689edc8700b670853f040d4aab1c41138a33
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-14
+
+    Track changes in prefered units and update widgets appropriately.
+    This addresses bug #852974.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@372
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-private.h
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/object-editor.c
+M      glabels2/src/wdgt-media-select.c
+
+commit 1d82d0c3852692d9931c1e5b0533ec50ba3646d1
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-12
+
+    Removed some artifacts in copy() method.  In particular a g_free()
+    on an unitialized automatic variable was removed, which caused a
+    copy/paste of a text object to segfault (See bug #857773).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@371
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-text.c
+
+commit 4d2997726e0d0c5a27e95cf674132c3f3a293d96
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-07
+
+    View box's object will track position in object editor.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@370
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-box.c
+
+commit 6acb95f4d5fc360a087b7a7f6ab4c9eb9848494e
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-06
+
+    - Changed gl_prefs from a simple structure to a full-fledged object
+    (prefs_model).
+    - Moved prefs_init after paper_init so that page size proof reading
+    code in prefs_model_load_settings works properly.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@369
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/commands.c
+M      glabels2/src/glabels.c
+M      glabels2/src/prefs-dialog.c
+A      glabels2/src/prefs-model.c
+C056   glabels2/src/prefs.h    glabels2/src/prefs-model.h
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/template.c
+M      glabels2/src/ui.c
+
+commit b9771d1ad8a9cf97ef7100adfed558098d53cb49
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-03
+
+    Adjust canvas scroll region if when label size is changed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@368
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit b4c795d8542654896ac92d04641cfc9b4a70bd8d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-03
+
+    Print dialog now tracks changes to a label's template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@367
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print-dialog.c
+
+commit fa0b7499395a94216c9502f06bce301d10fa42b0
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-03
+
+    Print dialog is now a full-fledged object, with a unique instance
+    attached to a view.  This address Bug #839860.  The dialog is also
+    no longer modal.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@366
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/view.h
+
+commit eb15aa82624a0bc2e24907b28c06ae7a33fb7f58
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-02
+
+    When setting ranges for object-editor size and position spinboxes,
+    allow for plenty of slop.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@365
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor-lsize-page.c
+M      glabels2/src/object-editor-position-page.c
+M      glabels2/src/object-editor-size-page.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+
+commit fb57f0fc0e806719cd1efacde8da67492eeed71d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-01
+
+    Text merge backend now assumes text files are encoded according to
+    the current locale -- converts to UTF8 for internal use.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@364
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-text.c
+
+commit f59501fe42e73950cac52de4362ec6937f0795b7
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-12-01
+
+    Getting ready for work on 1.93.1.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@363
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 516923ce1d1be249861bd04423fd8aebdc338675
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-30
+
+    Final preps for 1.93.0.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@361
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+M      glabels2/configure.in
+
+commit 0d23211916e298372d4cb0d7df1df1c4fe67c43b
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-29
+
+    Make sure canvas item representing selection region has a finite size.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@360
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 8a8670b3964dc497eb410a49a3c7a1d77ea3ff07
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-29
+
+    Added build dependency on libglade2.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@359
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/glabels.spec.in
+
+commit 2c65342596e10da4ca0a8219a7885b34cec7a6cc
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-29
+
+    Delay doing a gtk_widget_show on notebook until it is known if any
+    pages are visible or not.  Doing the show on a notebook with all
+    hidden pages causes a crash on Fedora Core 1/Gnome 2.4.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@358
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor.c
+
+commit 115198aeead93ef3ef97cd081f5b855622403e0a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-28
+
+    gl_view_delete_selection(): Actually clear out selection before
+    deleting these objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@357
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 6836860e2dab3b384e89982b8df9856b64c6c911
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-27
+
+    Created generic "get" methods for text, fill and line properties
+    for all label objects.  This will make it easier to track changes
+    in a general view such as the property toolbar.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@356
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label-191.c
+M      glabels2/src/xml-label.c
+
+commit 0bb61293a045dec136d8ef6d82186e54633f63a1
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-27
+
+    After setting max size, restore current setting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@355
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/object-editor-lsize-page.c
+
+commit 4d331ca9bd594283549e9415d96d40d87d3302d5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-27
+
+    Make sure canvas will regain focus if clicked on.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@354
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 608c6e669e6e169b92522131768dedf4f608b4f5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-26
+
+    Only act on zoom changes (modifying canvas scale and emitting signal)
+    if the new level is actually different.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@353
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 814500dd1a4686522d20abf06b02395d2a5ea230
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-26
+
+    Modified zoom code:
+    - Now keeps track of zoom levels, rather than screen scale
+    - Calculates home scale from screen DPI
+    - View size changes are tracked, and if selected zoom_to_fit is
+    maintained.
+    - New windows default to zoom_to_fit.
+    - Tracks changes in screen, so that new home scale can be updated
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@352
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/tools.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/window.c
+
+commit 127a39e7edb69b54cc0ca0b4d421c63891d9ab1f
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-26
+
+    Only present object property editor when selection is atomic.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@351
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui-sidebar.c
+
+commit af777d10cca19977c2cb80b7fa015b5ad77fdcd4
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-24
+
+    Glade files are now installed at GLABELS_GLADE_DIR.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@350
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/object-editor.c
+M      glabels2/src/prefs-dialog.c
+
+commit b6ae3725e4345dc9aeb153519678175d3f5ce12b
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-24
+
+    Updated to reflect current source files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@349
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 5f79a4f719b16e37880857730df9f5b65e4fbe17
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-24
+
+    Changed object property dialogs to a single object property editor
+    sidebar.
+    Added zoom to fit command.
+    Converted object property editor and preferences dialog to use
+    libglade and removed un-needed widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@348
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/glabels.c
+A      glabels2/src/object-editor-bc-page.c
+A      glabels2/src/object-editor-data-page.c
+A      glabels2/src/object-editor-edit-page.c
+A      glabels2/src/object-editor-fill-page.c
+A      glabels2/src/object-editor-image-page.c
+A      glabels2/src/object-editor-line-page.c
+A      glabels2/src/object-editor-lsize-page.c
+A      glabels2/src/object-editor-position-page.c
+A      glabels2/src/object-editor-private.h
+A      glabels2/src/object-editor-size-page.c
+A      glabels2/src/object-editor-text-page.c
+A      glabels2/src/object-editor.c
+A      glabels2/src/object-editor.glade
+A      glabels2/src/object-editor.h
+M      glabels2/src/prefs-dialog.c
+A      glabels2/src/prefs-dialog.glade
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_properties_24.png
+M      glabels2/src/stock.c
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+A      glabels2/src/ui-sidebar.c
+A      glabels2/src/ui-sidebar.h
+M      glabels2/src/ui.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+D      glabels2/src/wdgt-bc-data.c
+D      glabels2/src/wdgt-bc-data.h
+D      glabels2/src/wdgt-bc-props.c
+D      glabels2/src/wdgt-bc-props.h
+D      glabels2/src/wdgt-bc-style.c
+D      glabels2/src/wdgt-bc-style.h
+D      glabels2/src/wdgt-fill.c
+D      glabels2/src/wdgt-fill.h
+D      glabels2/src/wdgt-line.c
+D      glabels2/src/wdgt-line.h
+D      glabels2/src/wdgt-position.c
+D      glabels2/src/wdgt-position.h
+D      glabels2/src/wdgt-size.c
+D      glabels2/src/wdgt-size.h
+D      glabels2/src/wdgt-text-entry.c
+D      glabels2/src/wdgt-text-entry.h
+D      glabels2/src/wdgt-text-props.c
+D      glabels2/src/wdgt-text-props.h
+D      glabels2/src/wdgt-vector.c
+D      glabels2/src/wdgt-vector.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit 132b37df55e9e78afb0abb7de68696de150b59d4
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-24
+
+    Modified for upcomming 1.93.0.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@347
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 5894e21a4bcf7fd0bedda704828ee3dd3f7f4d31
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-17
+
+    Fixed cut-n-paste error:  font_italic_flag is gboolean, not
+    GnomeFontWeight.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@346
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+
+commit f550817d9014d2bbf5443dd55750fb23c4f327c6
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-16
+
+    Added italian translations.  Provided by Mancio <mancio_and@yahoo.it>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@345
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/configure.in
+A      glabels2/po/it.po
+
+commit 1821f44c12d204441415f0f86917aaf7d0dc1bdb
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-16
+
+    Updated copyright date in about dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@344
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+
+commit bbd5fe10e125d4920fb4ed8ef2433e1f5ef9e751
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-16
+
+    Updated japanese translation.  Provided by Takeshi Aihana
+    <aihana@jcom.home.ne.jp>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@343
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/ja.po
+
+commit b96836c5812bd54c4d077cacaa3f57cd8f821af5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-15
+
+    Added "break" in draw_markup_layer between line and circle cases
+    of switch. This fixes Bug #842705.  This is also the 2nd time I
+    have fixed this bug -- I must of neglected to check it in.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@342
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 679345152aca90d9e96764babfaffbf29ad947da
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-11
+
+    Prefixed $(configdir) with $(DESTDIR) in intall-data-local rule.
+    Patch provided by Andrew Lau <netsnipe@users.sourceforge.net> needed
+    to build debian package.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@341
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/Makefile.am
+
+commit 357dece84bdbf8a6a9cf229cf0145e247e0dc09e
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-09
+
+    Preparation for 1.92.3 release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@339
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 782c39f08243f6e5bac40feab7dfdae50e005957
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-09
+
+    Added additional user submitted templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@338
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/misc-iso-templates.xml
+
+commit c20fc06cf628c75318b2330b7bdf7892c5df7a89
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-09
+
+    Make the "Other" page size a full-fledged member of the pages list.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@337
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/paper.c
+
+commit c682ad48f57e9316b809a64f70514ed68f711ed5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-09
+
+    One of the signal handlers (view_scale_changed_cb) created with a
+    view_highlight actually belongs to view.  So when a view_highlight
+    is finalized, we must disconnect this handler.  This fixes the crash
+    reported in bug #836873.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@336
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+
+commit 0869fee988c04a6c7bf317fe92410c7a20e5cfeb
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-02
+
+    *** empty log message ***
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@335
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/barcode-0.98/configure
+M      glabels2/po/cs.po
+M      glabels2/po/de.po
+M      glabels2/po/es.po
+M      glabels2/po/fr.po
+M      glabels2/po/ja.po
+M      glabels2/po/pl.po
+M      glabels2/po/pt_BR.po
+M      glabels2/po/ru.po
+M      glabels2/po/zh_TW.Big5.po
+
+commit 12ffda8cb72321cfbd4e5d1e6775beaf34560261
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-11-02
+
+    Return immediately if --version option set.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@333
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+M      glabels2/src/glabels-batch.c
+
+commit de9574629d2b0fee2a1f898516863f80c9a43c53
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-31
+
+    Fixes glabels-batch frontend that broke when porting to gnome-print
+    2.2.  This fixes bug #832206.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@332
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/print.c
+
+commit b657e02ae4905a080de7ca849c5b5310e50b2b91
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-28
+
+    Much cleaner implementation of fix for Bug #822848.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@330
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/window.c
+
+commit ce3e06da0c3abb47e2d9b5970e5bce670e56d639
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-27
+
+    Brought README up-to-date, including updating website.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@329
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/README
+
+commit 5b8870cdd41d8dbede3ef438b87b030f0bf89591
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-27
+
+    Fix for Bug #822848:  in gl_window_destroy() unreference window->uic
+    and recent_view.
+
+    Hack:  squirrel away recent_view as data in window->uic, and extract
+    this in gl_window_destroy().  A better approach might be to wrap up
+    the ui_component in its own object, then simply unreference it.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@328
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui.c
+M      glabels2/src/window.c
+
+commit 299887846ca7b16b3eb7113a6efae93c73763647
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-27
+
+    Updated reference to glabels website.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@327
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+
+commit acd06beb42f79ed27a2d9a469c56e6daafb72fb8
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    New glabels icon.  Adding as a binary file this time.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@326
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/pixmaps/glabels-icon.png
+
+commit 1746d5fae438cdab908d883742c65f57d1243f23
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    Removing glabels-icon.png, to replace with new file to be added as
+    a binary file this time.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@325
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels2/pixmaps/glabels-icon.png
+
+commit f584c36b1ef64ce81102c1033632cbb5a10ffb33
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    Applied patch #826108:  Installs files to register glabels and
+    glabels filetypes/mimetypes with gnome.  This addresses bug #822852.
+    Supplied by Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
+    This patch adds the files:
+
+       pixmaps/glabels.png
+       data/glabels.mime
+       data/glabels.applications
+       data/glabels.keys.in
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@324
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/Makefile.am
+A      glabels2/data/glabels.applications
+M      glabels2/data/glabels.desktop.in
+A      glabels2/data/glabels.keys.in
+A      glabels2/data/glabels.mime
+M      glabels2/pixmaps/Makefile.am
+A      glabels2/pixmaps/glabels.png
+
+commit 9acf7f6f72a3f7aa70325cb99d5416167d7e1e99
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    Do not attempt to install header files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@323
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/recent-files/Makefile.am
+
+commit bd8f890e80ae5726deda06cd1874bbb3e6bc1f03
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    Cannot translate an empty string -- changed to " ".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@322
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+
+commit a679e0dc1aa5202475800847262095df1b1526d3
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    Removed references to old gnome-recent-* files.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@321
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 5fba23738c145c5767bab85e1e7f92d050c98ea3
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-19
+
+    glabels.spec.in:  Updated by merging with Dag Wieers's
+    <dag@wieers.com> glabels.spec file.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@320
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/glabels.spec.in
+
+commit c850d6c4b460d4eb71462b01b6dd8d67139faf54
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-18
+
+    Workaround for problem with gnome-print rendering images with alpha
+    channels.  See bug #822840.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@319
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+
+commit 6442032ba8d7117adead42725d24f8ffa0c6df6a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-18
+
+    Minor tweaks to Avery US definitions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@318
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/avery-us-templates.xml
+
+commit 0922af212e7e1fdd8c100bceb9d1107380afb101
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-17
+
+    Cleanup of Avery US-Letter templates.
+
+     - Spaced between manufacturer and part # to facilitate sorting,
+     i.e. Assume part #s are 5 digits and right justified.
+
+     - Unified descriptions so they are consistent with the generic
+     portion of Avery's descriptions, and their are fewer unique
+     descriptions to facilitate translations.
+
+     - If multiple types per sheet or part #, the part # is suffixed
+     with an appropriate description (e.g. 8391-Disc).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@317
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/avery-us-templates.xml
+
+commit 5a7ea2653f663ae324fb66854477600db97ee6fd
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-17
+
+    Allow comments anytime traversing a list of child nodes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@316
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-template.c
+
+commit c29868bc5e87ebd5e6531e2fc28261afafc183b5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-15
+
+    Applied patch #822935.  This patch slightly increases the invalidated
+    area during a redraw request, to account for anti-aliasing.
+    This prevent small artifacts from being left around when text
+    and barcode objects are dragged around the canvas. This patch
+    also corrects an oversight in view-barcode.c when converting from
+    gnome_canvas_hacktext to gl_canvas_hacktext.  This patch was provided
+    by Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@315
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/view-barcode.c
+
+commit 0b5900cdd4732d281af4023d38d6c830fe86627d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-13
+
+    Removed aclocal.m4.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@314
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels2/aclocal.m4
+
+commit a3f6bc15eabeeffe14eed2fe7645d2621f87f5ae
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-13
+
+    Patch #819541:  moved to latest libegg version of recent-files.
+    Patch provided by: Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@313
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 07a7b6952d0e27a252e12ef720bbc4d3e43bcd8b
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-13
+
+    Patch #820699:  corrects interpretation of Object-text nodes when
+    it consists of a single Field node.  Interpretation gets screwed
+    up by the automatic XML indentation.  Patch provided by:  Emmanuel
+    Pacaud <emmanuel.pacaud@univ-poitiers.fr>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@312
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 49344d5aee4d1c314ba4a16469501d0bf1a72c0d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-12
+
+    Added StartupNotify line.  Suggested by James Ogley
+    <james.ogley@pinnacle.co.uk>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@311
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/glabels.desktop.in
+
+commit d16472a553fb5e025784e0330a6c53278b61c7b1
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-12
+
+    Updated to reflect recent contributors.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@310
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+
+commit dc69b06e19b29c9d5c7eead7456e6cb45550cb2a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-09
+
+    Replacing gnome-recent* with current egg recent files module.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@309
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels.c
+D      glabels2/src/gnome-recent-marshal.list
+D      glabels2/src/gnome-recent-model.c
+D      glabels2/src/gnome-recent-model.h
+D      glabels2/src/gnome-recent-util.c
+D      glabels2/src/gnome-recent-util.h
+D      glabels2/src/gnome-recent-view-bonobo.c
+D      glabels2/src/gnome-recent-view-bonobo.h
+D      glabels2/src/gnome-recent-view.c
+D      glabels2/src/gnome-recent-view.h
+M      glabels2/src/recent.c
+M      glabels2/src/recent.h
+M      glabels2/src/ui.c
+M      glabels2/src/xml-label.c
+
+commit 060a20747c4aa07a07b8552151e491e60036e587
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-09
+
+    Replacing gnome-recent* with current egg recent files module.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@308
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/src/recent-files/Makefile.am
+A      glabels2/src/recent-files/egg-recent-item.c
+A      glabels2/src/recent-files/egg-recent-item.h
+A      glabels2/src/recent-files/egg-recent-model.c
+A      glabels2/src/recent-files/egg-recent-model.h
+A      glabels2/src/recent-files/egg-recent-util.c
+A      glabels2/src/recent-files/egg-recent-util.h
+A      glabels2/src/recent-files/egg-recent-vfs-utils.c
+A      glabels2/src/recent-files/egg-recent-vfs-utils.h
+A      glabels2/src/recent-files/egg-recent-view-bonobo.c
+A      glabels2/src/recent-files/egg-recent-view-bonobo.h
+A      glabels2/src/recent-files/egg-recent-view-gtk.c
+A      glabels2/src/recent-files/egg-recent-view-gtk.h
+A      glabels2/src/recent-files/egg-recent-view.c
+A      glabels2/src/recent-files/egg-recent-view.h
+A      glabels2/src/recent-files/update-from-egg.sh
+
+commit 1dacd983302ea408fc8faa1f794d0ad09f1d4019
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-08
+
+    Applied color combo patch, provided by Emmanuel Pacaud
+    (emmanuelp@sourceforge.net).  One distinct improvement is that the
+    icons are grayed out when the widget is insensitive.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@307
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/mygal/widget-color-combo.c
+M      glabels2/src/mygal/widget-color-combo.h
+
+commit 9c6084ffce76e776ce4716d2a0f4f09c9e65ac4d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-08
+
+    Changed default font from "Helvetica" to "Sans."
+    Patch provided by Emmanuel Pacaud (emmanuelp@sourceforge.net)
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@306
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/bc.h
+M      glabels2/src/label-text.c
+M      glabels2/src/prefs.c
+
+commit 72a09e53f6f8af5ed7d754c4f9ebabf4a28e919a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-10-08
+
+    Applied patch to correct conversion errors when reading files for many
+    non-"C" locales, i.e. locales where commas are used as decimal points.
+    Provided by Emmanuel Pacaud (emmanuelp@sourceforge.net).
+
+    Additionally modified, to allow locale format for in xml files to
+    be honored and to honor spaces between value and units.
+
+    All values written by glabels are now guaranteed to be in the
+    "C" locale.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@305
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml.c
+
+commit 48dd1bd999f454c730feaa4c1c9c69854a28145e
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-29
+
+    Fixed parsing of Text->Line nodes: removed artifact "== 0".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@304
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label-04.c
+
+commit fecdc335bcffe3ecc858fd9e8cd07ecb5964a14a
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-25
+
+    Added MediaLine template submitted as feature request at sourceforge.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@303
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/misc-iso-templates.xml
+
+commit 5e669ab469eea243df9922345e9223fcd30e9886
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-23
+
+    More descriptive Name and Comment.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@302
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/glabels.desktop.in
+
+commit 610ef2dea4f0cc6e12301295c27317cf87b826ad
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-23
+
+    Removed un-needed dependency on gdk-pixbuf.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@301
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit edfd7d16e33d5a1c03b8cb805dbfdfce5767694d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-22
+
+    gl_pixbuf_cache_remove_pixbuf():  Bail immediately if name == NULL.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@300
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/pixbuf-cache.c
+
+commit 1aff0b640e22e7eddc8c17a09f1d0636174e9926
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-18
+
+    Added option to print crop marks.  Suggested by Red Planet
+    <ephemeroot@yahoo.com>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@299
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+
+commit b4df48aa17705f9995b4b08e5d20bb241302d44b
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-07
+
+    Updated Japanese translations (Takeshi AIHANA
+    <aihana@jcom.home.ne.jp>).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@298
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/ja.po
+
+commit 5202a6f7ffb34a6cf7147e8dd57112a898ade761
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-05
+
+    Added categories field so that glabels will show up in the office
+    menu on RH9.  Thanks to David L Norris <dave@webaugur.com>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@297
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/glabels.desktop.in
+
+commit 27acbc86591eb7548bf507d09b5ea7a9ed036134
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-03
+
+    Fixed typo.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@295
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/view.c
+
+commit 407e8e0f8195fde90fbd384cceba03e460ed0543
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-02
+
+    Changed LGPL notices to GPL, as required by the LGPL section 3.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@294
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/mygal/color-group.c
+M      glabels2/src/mygal/color-group.h
+M      glabels2/src/mygal/color-palette.c
+M      glabels2/src/mygal/color-palette.h
+M      glabels2/src/mygal/e-colors.c
+M      glabels2/src/mygal/e-colors.h
+M      glabels2/src/mygal/e-util.h
+M      glabels2/src/mygal/gtk-combo-box.c
+M      glabels2/src/mygal/gtk-combo-box.h
+M      glabels2/src/mygal/widget-color-combo.c
+M      glabels2/src/mygal/widget-color-combo.h
+
+commit 01b7a7b4909da417036c09ea42151602dd2249c7
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Brought acknowledgements up-to-date.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@293
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+
+commit 221fb81668fb66b84cf249269857655f76ef2528
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added waste attribute to all CD/DVD labels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@292
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/avery-iso-templates.xml
+M      glabels2/data/misc-iso-templates.xml
+M      glabels2/data/misc-us-templates.xml
+M      glabels2/data/zweckform-iso-templates.xml
+
+commit 0f6fbe429033b21c7c4fd66d284140a121bead60
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@291
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+
+commit 71f5a916bf906c4b25c6ebfb3ee9bfe43e84bbe6
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    In clip_punchouts(), center hole correctly on business card CDs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@290
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+
+commit 1dec5fe436bd8b08d648bc8a7da2171ed137a2cc
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added XInclude support.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@289
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 4d6e1a622b1df731ca3d46353170e725f30ac369
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added hack to save ink, by not printing within CD holes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@288
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+
+commit a119bbef560e4699fae660a1d8c6c4cf67310646
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Superficial code formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@287
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/template.c
+
+commit 38b1468153a8c46e88246bd029de4ee016724a1f
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added support for Markup-circle in templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@286
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/glabels-2.0.dtd
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/view.c
+M      glabels2/src/xml-template.c
+
+commit 165c5ca1599ac03d43077486cc90e46d3dde6bac
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added compatability parser for files generated with 1.91.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@285
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/xml-label-191.c
+A      glabels2/src/xml-label-191.h
+M      glabels2/src/xml-label.c
+
+commit b1c557ddbf0a5e20d5aa52e100e400804a101738
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-09-01
+
+    Added templates that have been collecting dust in my inbox.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@284
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/TODO
+M      glabels2/data/avery-us-templates.xml
+M      glabels2/data/misc-iso-templates.xml
+M      glabels2/data/misc-us-templates.xml
+
+commit 0e23a07185249e1efecc272f9d5f3ad42a439d54
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Broke out template file into separate files, organized by manufacturer
+    and page size standard (us and iso).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@283
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/Makefile.am
+A      glabels2/data/avery-iso-templates.xml
+A      glabels2/data/avery-us-templates.xml
+A      glabels2/data/misc-iso-templates.xml
+A      glabels2/data/misc-us-templates.xml
+D      glabels2/data/predefined-templates.xml
+A      glabels2/data/zweckform-iso-templates.xml
+M      glabels2/po/POTFILES.in
+
+commit 114640562d0fb46ac65e0afadc54c1db0fd69d44
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    No longer use RLE for pixdata -- this caused crashes for many images.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@282
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 0e570fb78805dcd3ca466e5ad35eeec4db2beaa6
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Added waste attribute to Avery 5931 template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@281
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-templates.xml
+
+commit 580cabfe1f1dee67e3952066a24e65eda443f184
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Added waste attribute to label templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@280
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+M      glabels2/src/template.h
+M      glabels2/src/xml-template.c
+
+commit e318f4a1459cd1b2ae90583d3c25007225d3c0b3
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    "Merge_fields" is now simply "Merge"
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@279
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 2d88eaebd52cdd58e6e0fc0b7eb8975f44b62a5f
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    - Replaced gnome color pickers with mygal color combos.
+    - Made context of all color groups NULL.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@278
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui-property-bar.c
+M      glabels2/src/wdgt-bc-props.c
+M      glabels2/src/wdgt-fill.c
+M      glabels2/src/wdgt-line.c
+M      glabels2/src/wdgt-text-props.c
+
+commit 4c60c14f0536b5733898c93d3a9f1a61cf15f6b2
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    gl_wdgt_line_get_params(): Line width is double, not int!
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@277
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-line.c
+
+commit 24dde46b0c1467f17749404de6fb902073864c07
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Updated to use 2.0 file formats.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@276
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-paper.c
+M      glabels2/src/xml-template.c
+M      glabels2/src/xml-template.h
+M      glabels2/src/xml.c
+
+commit 03a364f16bab38c0551af5e804e5394c9b875c80
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Use theme colors for shadow and selections.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@275
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+
+commit 9f032dc3bb103835673fabedf82a6d2a9efbc1a4
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Created DTD for glabels 2.0 file types.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@274
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/Makefile.am
+A      glabels2/data/glabels-2.0.dtd
+M      glabels2/data/paper-sizes.xml
+M      glabels2/data/predefined-templates.xml
+
+commit 42b8f5fed3158ccf418d34d1ade3c8dca8984a42
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-08-31
+
+    Updated to reflect current development plan.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@273
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+
+commit f99a01c8886bfb351ed488403faa79036294e7ae
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-07-27
+
+    - Added mygal, a modified version of the gal library, to provide a
+    sophisticated color combo widget.
+
+    - Added ui-property-bar.[ch] and ui-util.[ch] to add a property
+    bar to edit some properties of selections without going through a
+    "edit properties" dialog.
+
+    - Added stock icons
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@272
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/glabels.c
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-line.c
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+A      glabels2/src/mygal/Makefile.am
+A      glabels2/src/mygal/color-group.c
+A      glabels2/src/mygal/color-group.h
+A      glabels2/src/mygal/color-palette.c
+A      glabels2/src/mygal/color-palette.h
+A      glabels2/src/mygal/e-colors.c
+A      glabels2/src/mygal/e-colors.h
+A      glabels2/src/mygal/e-marshal.list
+A      glabels2/src/mygal/e-util.h
+A      glabels2/src/mygal/gtk-combo-box.c
+A      glabels2/src/mygal/gtk-combo-box.h
+A      glabels2/src/mygal/widget-color-combo.c
+A      glabels2/src/mygal/widget-color-combo.h
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
+A      glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
+A      glabels2/src/stock-pixmaps/stock_pencil_16.png
+A      glabels2/src/stock-pixmaps/stock_pencil_24.png
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+A      glabels2/src/ui-property-bar.c
+A      glabels2/src/ui-property-bar.h
+A      glabels2/src/ui-util.c
+A      glabels2/src/ui-util.h
+M      glabels2/src/ui.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/wdgt-text-props.c
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit d2dcd6e7dc0d0ede254a3fb656a6aad8c9dec747
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-07-27
+
+    - Added mygal, a modified version of the gal library, to provide a
+    sophisticated color combo widget.
+
+    - Added ui-property-bar.[ch] and ui-util.[ch] to add a property
+    bar to edit some properties of selections without going through a
+    "edit properties" dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@271
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 007d50748d65f43a899a21c1836aa5ac327491b6
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-07-27
+
+    Added mygal, a modified version of the gal library, to provide a
+    sophisticated color combo widget.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@270
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/aclocal.m4
+M      glabels2/configure.in
+
+commit 4fb60b25ad3cb3f2eb883f7fff949f9394a49aaa
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-07-19
+
+    Fixes crash on XD2: start with an object size of 1pt x 1pt, instead
+    of 0 x 0.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@269
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-image.c
+
+commit d914113d4e1b767dbba1b36249524327238d58c8
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-07-07
+
+    Harmonized runtime checks for view and view->label.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@268
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 93756b4b8da8dc80900dc8f28499489ef31986b5
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-30
+
+    - View now tracks label resize events.
+
+    - Template instantiations assume name of actual alias selected.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@267
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/file.c
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/xml-template.c
+
+commit 59462f65a2db3cc6b6a1adb381f568eb5b5201ec
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-28
+
+    Added FileProperties dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@266
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+M      glabels2/src/commands.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/ui.c
+M      glabels2/src/xml-template.c
+
+commit 23225999ec5847db64faffcae78e0aa136a6c1ed
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-28
+
+    - xml-template.c:  use page size name as a fallback if id doesn't
+    exist.
+
+    - print.c: don't set page size id for config
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@265
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+M      glabels2/src/xml-template.c
+
+commit 799b35b71486eb37a7435ac76134a2a7441cb8ee
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-23
+
+    The widget should now correctly use the page size "id" when
+    interacting through its API, but use the page size "name" (which
+    may be localized) when interacting with the human user.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@264
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+
+commit 34867c4f967a93042e453e550aa5a7921141db7b
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-23
+
+    Renamed files to support gettextizing with intltool.
+       page-sizes.paper -> paper-sizes.xml
+       predefined-labels.template ->predefined-templates.xml
+
+    xml-paper now looks for files with ".paper" extension or exactly named
+    "paper-sizes.xml".
+
+    xml-template now looks for files with ".template" extension or
+    ending with
+    "-templates.xml".
+
+    Gettext is run on attributes starting with "_" in both xml-paper
+    and xml-template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@263
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/paper.c
+M      glabels2/src/template.c
+M      glabels2/src/xml-paper.c
+M      glabels2/src/xml-template.c
+
+commit 42fd154b7670f4a7db82fa0990f856ccd3bd3270
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-23
+
+    Renamed files to support gettextizing with intltool.
+       page-sizes.paper -> paper-sizes.xml
+       predefined-labels.template ->predefined-templates.xml
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@262
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/Makefile.am
+R100   glabels2/data/page-sizes.paper  glabels2/data/paper-sizes.xml
+R089   glabels2/data/predefined-labels.template
+glabels2/data/predefined-templates.xml
+M      glabels2/po/POTFILES.in
+
+commit b3e89167d2b78e0c48ce7239db145b8be9d48757
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-22
+
+    - Created Makefile.am in ./data and ./pixmaps directories
+       - Modified ./configure.in and ./Makefile.am to work with these
+       Makefiles
+       - Moved glabels.desktop to ./data directory
+
+    - Changed version to 1.92.0 in ./configure.in
+
+    - Added page-sizes.paper to ./data -- it seems to be less hassle
+    to maintain
+      a local paper size database.
+
+    - Added paper.[ch] and xml-paper.[ch] to ./src.
+
+    - Converted to libgnomeprint-2.2 -- serious hack: ignoring the
+    fact that
+      gnome-printer-selector is private.
+
+    - Added files to ./po/POTFILES.in
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@261
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+A      glabels2/src/paper.c
+A      glabels2/src/paper.h
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+A      glabels2/src/xml-paper.c
+A      glabels2/src/xml-paper.h
+M      glabels2/src/xml-template.c
+
+commit 608bd2f3e4b58fb6598cc15c52c467990c3295cf
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-22
+
+    - Created Makefile.am in ./data and ./pixmaps directories
+       - Modified ./configure.in and ./Makefile.am to work with these
+       Makefiles
+       - Moved glabels.desktop to ./data directory
+
+    - Changed version to 1.92.0 in ./configure.in
+
+    - Added page-sizes.paper to ./data -- it seems to be less hassle
+    to maintain
+      a local paper size database.
+
+    - Added files to ./po/POTFILES.in
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@260
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/po/cs.po
+M      glabels2/po/de.po
+M      glabels2/po/es.po
+M      glabels2/po/fr.po
+M      glabels2/po/ja.po
+M      glabels2/po/pl.po
+M      glabels2/po/pt_BR.po
+M      glabels2/po/ru.po
+M      glabels2/po/zh_TW.Big5.po
+
+commit da616712ac9ecf2dd8a642839ff052e8827a4066
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-22
+
+    - Created Makefile.am in ./data and ./pixmaps directories
+       - Modified ./configure.in and ./Makefile.am to work with these
+       Makefiles
+       - Moved glabels.desktop to ./data directory
+
+    - Changed version to 1.92.0 in ./configure.in
+
+    - Added page-sizes.paper to ./data -- it seems to be less hassle
+    to maintain
+      a local paper size database.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@259
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/data/Makefile.am
+A      glabels2/data/glabels.desktop.in
+A      glabels2/data/page-sizes.paper
+A      glabels2/pixmaps/Makefile.am
+
+commit ac2056db0f3c63d362789598da0232ce858050af
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-22
+
+    - Created Makefile.am in ./data and ./pixmaps directories
+       - Modified ./configure.in and ./Makefile.am to work with these
+       Makefiles
+       - Moved glabels.desktop to ./data directory
+
+    - Changed version to 1.92.0 in ./configure.in
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@258
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/Makefile.am
+M      glabels2/aclocal.m4
+M      glabels2/configure.in
+D      glabels2/glabels.desktop
+
+commit e6e1186a7ed01d5c26c43ff7f02107a998caeb87
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-06-07
+
+    Reconciled unit names with absolute unit names from CSS2 spec
+    (section 4.3.2).
+    Fixed comparison in gl_xml_get_prop_length().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@257
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml.c
+
+commit 2eab1f387f9288550bac8c615b707eaa58235084
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-05-26
+
+    In xml.[ch]:
+      - Added functions to get and set length properties:
+       gl_xml_get_prop_length()
+       gl_xml_set_prop_length()
+
+      - Changed gl_xml_get_prop_uint_hex() to gl_xml_get_prop_uint().
+      It should
+       automatically determine base according to "C" rules, i.e. "0x"
+       => hex,
+       "0" => octal, and anything else is decimal.
+
+      - gl_xml_get_prop_int() has also been modified to use the "C" rules.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@256
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-template.c
+M      glabels2/src/xml.c
+M      glabels2/src/xml.h
+
+commit 9f6e057631e99baa8c5cd1eff1b661c54f578f24
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-30
+
+    Made all comparisons case sensitive.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@255
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-template.c
+M      glabels2/src/xml.c
+
+commit 9b6570c2ad57f9394121cc17175b95f72d43dc4c
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-28
+
+    Moved template xml functions to separate module (xml-template.[ch]).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@254
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/xml-label.c
+A      glabels2/src/xml-template.c
+A      glabels2/src/xml-template.h
+
+commit d7e2e958e19d141526a63ad6d975b6f89ee2d67d
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-27
+
+    Applied barcode patch to save and restore barcode sizes, provided
+    by Alessandro Zummo <azummo@towertech.it>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@253
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 644ae2cb7da38765dfb8dc900eb76eb4be5ae84c
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-27
+
+    Added various templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@252
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+
+commit e3473cc57bad364568a8b127a4d6ac7149a01365
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-27
+
+    Added various acknowledgments.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@251
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+
+commit a60ea319cf36ef22786f6c4853eb25c2a5931170
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-04-27
+
+    Added Czech translations, thanks to David Makovský(Yakeen)
+    <yakeen@sannyas-on.net>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@250
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+A      glabels2/po/cs.po
+
+commit 9d25899fa01c234a3f868c459b6459061b350e74
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-26
+
+    Cleanup of code formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@248
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml.c
+
+commit b8723dacf7eff5c8ac7acaad5dc4986900921bdd
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-26
+
+    Removed unused signals[] array.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@247
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge.c
+
+commit 19c65879b8dcd02bae6a484f339ecc4dc4a55e5f
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-26
+
+    Fixed parameters sent to gl_label_barcode_set_props() when creating
+    new barcode.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@246
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+
+commit 251323ecb306c6ed40528a6e57e0dbd2a0495f5c
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-25
+
+    Barcodes are now resizable interactively on the canvas in both width
+    and height (no more scale).
+    Added checkbox to turn-off checksum digit on barcodes when it is
+    optional.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@245
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-gnubarcode.h
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc-postnet.h
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/print.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/wdgt-bc-props.c
+M      glabels2/src/wdgt-bc-props.h
+M      glabels2/src/wdgt-bc-style.c
+M      glabels2/src/wdgt-bc-style.h
+M      glabels2/src/xml-label.c
+
+commit 68b7f3520db383f2ca7000533e63c39f3f07f7c7
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-16
+
+    Text box refinement.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@244
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/print.c
+M      glabels2/src/view-text.c
+
+commit 8658f7ffd7739571743c8827b994a0c09d2713ab
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-08
+
+    Added xml_set_prop_*() utilities to xml.c.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@243
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/template.c
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml.c
+M      glabels2/src/xml.h
+
+commit 08f61b05720c3fbd5e44c8723a171f08495683d1
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-07
+
+    Added text box support.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@242
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/view-text.c
+M      glabels2/src/xml-label.c
+
+commit 5a7b691ea17308062acf0d62f92ee8811aaeee5e
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-07
+
+    Added xml utility module.  Parsing of label and template xml files
+    should no longer strand pointers returned from xmGetProp().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@241
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/template.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+A      glabels2/src/xml.c
+A      glabels2/src/xml.h
+
+commit 2421a75ff0aa9b7b8e1ccf9e944b138b547be044
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-06
+
+    Updated ja and pt_BR translations.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@240
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/ja.po
+M      glabels2/po/pt_BR.po
+
+commit 9be83cfe285d2774a6ba97d5cd2fee67e8135f9f
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-06
+
+    Updated pt_BR translations.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@239
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/po/pt_BR.po
+
+commit 8a0aa0721e17c5256a5f35fb44714844bec41195
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-06
+
+    Added pixbuf cache and base64 modules.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@238
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit caa0ba592597dccf7b6980e66ccd7f591c115410
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-06
+
+    Added pixbuf cache and base64 modules.
+    Pixbufs are now saved in a glabels file as a base64 encoded version
+    of the serialized pixdata.
+    Files are now compressed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@237
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+A      glabels2/src/base64.c
+A      glabels2/src/base64.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/glabels.c
+M      glabels2/src/label-image.c
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+A      glabels2/src/pixbuf-cache.c
+A      glabels2/src/pixbuf-cache.h
+M      glabels2/src/view.c
+M      glabels2/src/xml-label.c
+
+commit 2a1ec544be08cf7cf5e0d1c801627d73aa0b5424
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-03
+
+    Added support for "Other" page sizes.  Template sheets with a page
+    size of "Other" should also have the height and width properties set.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@236
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-mini-preview.h
+
+commit 73e3165ed36f77fa7048140ccdc4a0e982189a37
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-02
+
+    Bumped up version to 1.91.1, in preparation for next release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@235
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 6becaea14febeb218e1b071014ce1a7458df0d60
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-02
+
+    Added support for Business Card CD Labels (Clipped circular shape).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@234
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+
+commit 916e4368d97d638db065e79f3ab694701d20cdbc
+Author: Jim Evins <evins@snaught.com>
+Date:  2003-01-02
+
+    Added support for Business Card CD Labels (Clipped circular shape).
+    Fixed artifact hack in wdgt-rotate-label -- made sure the scroll
+    region was
+    as large as the canvas, so that the label was not shoved into the
+    upper left corner of the canvas.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@233
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label.c
+M      glabels2/src/print.c
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 168faf48af68963a103de1def4f87d15ddb6f9b9
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-31
+
+    Use art_affine_scale() to flip objects instead of art_affine_flip().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@231
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+
+commit 11fc5ffdd802110a1997d3746f7488424674d460
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-31
+
+    Created "File" tag for literal filenames for image objects.
+    Added "Literal" tag to barcode objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@230
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit b8b1d634eaf6b7b6e369e4521cb5a03c1946fc36
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-31
+
+    Do not g_object_unref a merge object, if NULL.  Caused warnings
+    during paste.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@229
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label.c
+M      glabels2/src/view-text.c
+M      glabels2/src/xml-label.c
+
+commit dfdf166ca400fd4028dda0248a0be7f19d7383c4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-28
+
+    No longer attempt to rotate/flip around center of object.  This was
+    very problematic because the object's affine keeps changing under
+    one's nose.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@228
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/print.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+
+commit d69454e4ad96cdef3501a62fb60bb3dab2316104
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-28
+
+    glLabelText now uses a GtkTextBuffer to store text, in preparation
+    for editing of text in place.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@227
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-text-entry.c
+M      glabels2/src/wdgt-text-entry.h
+
+commit 8c26425f775cdc04c4410583a91047fef0452a50
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-28
+
+    Fixed compiler warning.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@226
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label-04.c
+
+commit 0bdc99ef3c41c53bdf59bdad64090dc8a7f71b0a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-28
+
+    Moved item event handler to view-object.c.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@225
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit b4cafe8f16b8cd51af2f50dafd69ac19fa5f844b
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-27
+
+    "New" dialog is now modal.
+    Added short name to titles of "print" and "save as" dialogs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@224
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/file.c
+M      glabels2/src/print-dialog.c
+
+commit 538b382224f845af298b3559bcfa229f410625ac
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-27
+
+    Window title cleanup.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@223
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/window.c
+
+commit b055a6afad199d05172022bf79eb820639907bad
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-27
+
+    Merge property dialog now a widget.
+    One merge property dialog per view.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@222
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge-properties-dialog.h
+M      glabels2/src/tools.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit c41c7bae0176ffce9880b4d4e64e81757366792d
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-25
+
+    Formatting clean up.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@221
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/template.h
+M      glabels2/src/text-node.h
+
+commit 92e9778eea389de001b4230c76c0870fb1e9ead6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-25
+
+    Catching up on backlog of template submissions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@220
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/predefined-labels.template
+
+commit 21c78e4b481abe340cfcb6af32c1ef1ba0ac223a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-25
+
+    Adds test to ensure a valid font family.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@219
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-text.c
+M      glabels2/src/wdgt-text-props.c
+
+commit aabdc641bfd8f609709a486bdeb965c690f5d734
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-24
+
+    Use object specific methods to determine size when determining extent
+    and centers of objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@218
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+
+commit fd9d7b5004b57bfaf00e9fc1abbf6ee6035aa3f5
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-22
+
+    Removed unused gl_view_object_get_dialog() function.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@217
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-object.c
+
+commit 26ef752a7bc6e9bd7546c95c1639e8d967564c47
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-22
+
+    Fixes crash in gl_text_node_lines_expand() when line contains
+    no nodes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@216
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/text-node.c
+
+commit f5a3b04a4318c31e49a2a4f169e5f172d3f42db4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-15
+
+    Always set default entry when loading new strings in the
+    template_combo.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@215
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-media-select.c
+
+commit ccbf23cfc7000b5aeba5030fb7e7cca066a1a315
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-12
+
+    More work on images from merge data.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@214
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-image.c
+M      glabels2/src/view-image.c
+M      glabels2/src/wdgt-image-select.c
+
+commit 5ddb04aa4cf50122ae8d65409a00f6999c5cf169
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-11
+
+    Initial support for supplying images from merge data.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@213
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/print.c
+M      glabels2/src/text-node.c
+M      glabels2/src/view-image.c
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+
+commit 9b08719f732321618f6f96c5863b3ad3ed01eb7f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-10
+
+    Added wdgt_image_select widget for selecting image files or merge
+    fields for images.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@212
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/wdgt-image-select.c
+A      glabels2/src/wdgt-image-select.h
+
+commit 3a083dee8b93f54529ea0bcb448fb9cb1c44a105
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Fixed logic to remember previous merge source.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@211
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-properties-dialog.c
+
+commit 7091e560600fb41c01cb88f334e54cbb6cd7ea0b
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Added logic that ignores lines containing a single empty field
+    (e.g. ${ADDRESS2} == "").
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@210
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/text-node.c
+
+commit c1392472ae18285bbfcc4101d0a87f7c7e5e67d8
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Removed annoying affine debug statements.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@209
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/canvas-hacktext.c
+
+commit 5c151d532ee53365a3e1695e2c88f3a6ddd4d3e6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Added GtkTreeView w/ model to preview fields and allow record
+    selection.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@208
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-properties-dialog.c
+
+commit ae1e0d489c56591c29fda89d0d733c050c19cafb
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Added get_primary_key method.
+    Rewrote  gl_merge_get_key_list() to use record_list().
+    Ported improved CSV parser from 0.4.6.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@207
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge-text.c
+
+commit 17c607468d325aa3abb43db3d5c5fa00458303ff
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Added get_primary_key method.
+    Removed open, close, get_record, free_record, free_record_list
+    functions
+    from public API.
+    Renamed gl_merge_read_record_list() to gl_merge_get_record_list().
+    Renamed gl_merge_count_records() to gl_merge_get_record_count().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@206
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/merge.c
+M      glabels2/src/merge.h
+
+commit 5f50ecbe6d0aba98f76a169f1eec5600f20eb3f3
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Moved gl_merge_get_record_list() to inner-most functions possible.
+    Fixed page_begin logic for merge print functions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@205
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+
+commit c7ba6d95b143d1f44d1e8f615ebcebde8384e686
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Changed field text from "FIELD{*}" to "${*}".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@204
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/wdgt-text-entry.c
+
+commit 5f7abd61a52ac90b4e4b7d21e006dfd8d10bd36f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Corrected order of arguments to gl_merge_eval_key().
+    Changed field text from "FIELD{*}" to "${*}".
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@203
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/text-node.c
+
+commit 4725dd8e0562bb35593ec155215f7b583931ec89
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    Bumped up namespace to 1.92.
+    Literal text is now contained in "Literal" nodes -- this breaks
+    compatability with 1.89 and 1.90.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@202
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/xml-label.c
+
+commit 44dfc43fde047c1d6f8cfe13c91debaa7ea37fa8
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-08
+
+    gl_window_new_from_file() no longer ignores abs_filename.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@201
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/window.c
+
+commit da99416fc86eb1724eec8ed335624a6566f09296
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-05
+
+    Multiple fixes to merge type and properties dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@200
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label.c
+M      glabels2/src/merge-init.c
+M      glabels2/src/merge-properties-dialog.c
+M      glabels2/src/merge.c
+
+commit efe5baf8e0405b1f4cc7c6740fb30853ed68b62e
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-03
+
+    Additions to development plan.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@199
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+
+commit d4ebf0e752a63bc3a16b52226aba3be1aec5ff5f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-03
+
+    New document merge API.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@198
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/glabels-batch.c
+M      glabels2/src/glabels.c
+M      glabels2/src/label.c
+A      glabels2/src/merge-init.c
+C080   glabels2/src/merge-properties.h glabels2/src/merge-init.h
+R067   glabels2/src/merge-properties.c
+glabels2/src/merge-properties-dialog.c
+R083   glabels2/src/merge-properties.h
+glabels2/src/merge-properties-dialog.h
+M      glabels2/src/merge-text.c
+M      glabels2/src/merge-text.h
+D      glabels2/src/merge-ui-text.c
+D      glabels2/src/merge-ui-text.h
+D      glabels2/src/merge-ui.c
+D      glabels2/src/merge-ui.h
+M      glabels2/src/merge.c
+M      glabels2/src/merge.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
+M      glabels2/src/tools.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-bc-data.c
+M      glabels2/src/wdgt-bc-data.h
+M      glabels2/src/wdgt-text-entry.c
+M      glabels2/src/wdgt-text-entry.h
+M      glabels2/src/xml-label-04.c
+M      glabels2/src/xml-label.c
+
+commit ff94fb2d1395644838dd247aa0643c27878afd99
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-01
+
+    Changed M_PI to G_PI.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@197
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-vector.c
+
+commit 928d14291b48a6cdf432a2e0990c82da0d8c91a4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-12-01
+
+    free name during finalize.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@196
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+
+commit 99b753edef76d37dbca105ced4c2f08df2c4b2f9
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-30
+
+    Added callback to adjust affine of highlight.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@195
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+
+commit 87a9ff607ba011815f80a7487492fc612c95af50
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-30
+
+    Removed obsolete menu from view_object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@194
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+
+commit 8630930291f7555b2bbeeafb20f5a7ae25629933
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-30
+
+    Disconnect callbacks that reference the properties dialog when it
+    is destroyed.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@193
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+
+commit aba3b4b013d3f41252dcffe263446c88bbfba2db
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-29
+
+    Added functions gl_view_rotate_selection_left() and
+    gl_view_rotate_selection_right().
+
+    Added new context menus.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@192
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/tools.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit d0bfe7d204fc9a159c2105b012a8aefe030cc261
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-29
+
+    Added stock_properties_16 icon.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@191
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_properties_16.png
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+
+commit cc528ab2e13a2d518b90df1734e775eea5132169
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-28
+
+    Added commands to center selected objects to center of label.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@190
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+M      glabels2/src/ui.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 0f6a9bcff38a3f8f0af56c911c6fe8217ff746f4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-28
+
+    Added stock_center_horiz and stock_center_vert stock icons.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@189
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_center_horiz_16.png
+A      glabels2/src/stock-pixmaps/stock_center_vert_16.png
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+
+commit d29dec5925a922fda1a513c7aa5707760a3a6c2f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-28
+
+    Updated russian translations, thanks to Vitaly Lipatov
+    <LAV@VL3143.spb.edu>.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@188
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/ru.po
+
+commit cc5a600a2678408e69b8336481ca8eabec7471cd
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-28
+
+    Added additional templates from my backlog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@187
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/predefined-labels.template
+
+commit 2cd7297ae45065421acc610b767b82c9608a475d
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-28
+
+    Added strategic debug statement to help locate bad templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@186
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/template.c
+
+commit c31a43a3500a82401710abef158614e6c24e8a4a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-26
+
+    Cleaned up label object duplication code.
+    Added get_size methods for text and barcode objects.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@185
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+M      glabels2/src/view.c
+
+commit 7fc9f03681245fcf04dee4f3392931f58f9c755b
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-25
+
+    Added menu icons for order, rotation, and flipping commands.
+    Split Align submenu, into Horizontal and Vertical submenus.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@184
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+M      glabels2/src/ui.c
+
+commit 5600ac72e77355eb50496eb8d079752649d1fb0f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-25
+
+    Added menu icons for order, rotation, and flipping commands.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@183
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_flip_horiz_16.png
+A      glabels2/src/stock-pixmaps/stock_flip_vert_16.png
+A      glabels2/src/stock-pixmaps/stock_order_bottom_16.png
+A      glabels2/src/stock-pixmaps/stock_order_top_16.png
+A      glabels2/src/stock-pixmaps/stock_rotate_left_16.png
+A      glabels2/src/stock-pixmaps/stock_rotate_right_16.png
+
+commit e745ae478b6bada6bac871e50d084b9cb4ce93d1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-25
+
+    Added object alignment commands.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@182
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+M      glabels2/src/ui.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 9ed794d648593c56391e2c39ba3d45a891f0db23
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-25
+
+    Menu icons for alignment commands.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@181
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_align_bottom_16.png
+A      glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
+A      glabels2/src/stock-pixmaps/stock_align_left_16.png
+A      glabels2/src/stock-pixmaps/stock_align_right_16.png
+A      glabels2/src/stock-pixmaps/stock_align_top_16.png
+A      glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
+M      glabels2/src/stock.c
+M      glabels2/src/stock.h
+
+commit 29b2a2d7ad849248f70907052594d3b6a95d4c55
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-22
+
+    Made set_size and get_size into child methods for label-object,
+    and construct_dialog for view-object.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@180
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-text.c
+
+commit 7942bd2b1dc7d4adc0ee51d858d34efa92acc6c7
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-22
+
+    Made set_size and get_size into child methods.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@179
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/view-object.h
+
+commit 7b27fc9199039b2e5397c0a9bc5e5d7b27cfb969
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-21
+
+    Moved highlights/handles to separate layer (top-level group).
+    Tweaked appearance of highlights.
+    Removed shuffling of items after a raise or lower, these were
+    artifacts from when all items belonged to a single top-level group.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@178
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 09c923e6b7ea8b9f1dd47cb52489c47361ec6a1f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-11
+
+    Workaround for flipping/rotation problem for gdkpixbuf items.
+    See libgnomecanvas bug #97604.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@177
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-object.c
+
+commit 6ad4f9c94f5cf0144a068649c857638c742b420a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-11
+
+    Added initial object rotation code.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@176
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/print.c
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+M      glabels2/src/ui.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/xml-label.c
+
+commit c83e8558a35b8713796e36370bf53064c57b1426
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-08
+
+    Replaced gdk_pointer_grab() calls with gnome_canvas_item_grab() calls.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@175
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-mini-preview.c
+
+commit d1cfc9aeeebab5ed3e98686fb59fbdcd5521b5c4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-04
+
+    Unref highlight before destroying group.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@174
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-object.c
+
+commit a922bbec35a3b9a3fff8fdf38537a460c8b48c71
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-03
+
+    Adds code to set the view canvas's background color.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@173
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/view.c
+
+commit 48b3f4e54f4a46f7265b3e0da02941d4865d6165
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-11-03
+
+    Highlight is now placed in object group, so it no longer needs to
+    track object movements.  This also causes the label layer to appear
+    as an ancestor of the highlight objects so that object_at in view.c
+    does the right thing.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@172
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+
+commit 580011286a8e406198575a1222b980ba8e5e9a05
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Added demonstration markup lines to Avery 5931 and its lookalikes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@171
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+
+commit 8f156fce93d5cc64c4722893522ec1dbabba5513
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Added line markup to template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@170
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/view.c
+
+commit 2b0d83bbb2a14f5ecfb3b17fd786f4fcb780febb
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Fixes finalization problems with highlight and object properties
+    dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@169
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+
+commit 9fc4f06840b10c94445cad21d24b6f78c79cff65
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Includes grid lines at perimeter.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@168
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit b897cdcafbb9d3ab52cda4ca8f74409d3ce3d4eb
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Changed version in preparation for next release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@167
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/configure.in
+
+commit 24a6782ee37fe2057675d7699670f7890909b7b5
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-20
+
+    Added grid to view.
+    Created distinct gnome_canvas_groups for each distinct layer in view.
+    Grid and markup visibility are now controlled by view menu.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@166
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
+M      glabels2/src/ui.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/window.c
+
+commit e6d13b329522599b11a8fa5682644d8420657ce6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-15
+
+    View_highlight is now a full-fledged object that tracks its
+    corresponding label object independently.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@165
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-highlight.h
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+
+commit 128e0c135f9048b32de6c0ac6c1a46f6f7140baa
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-15
+
+    Pointer events are now generated for all modes.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@164
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+
+commit 814a682c9362f01d7a3847153b0a37e103d83b17
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    Initial flipping support -- still has some problems.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@163
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/marshal.list
+M      glabels2/src/print.c
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/xml-label.c
+
+commit 72888ff037ca8e1c0fea29b8f908a4bb69966976
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    Now uses gl_label_object_copy_props() in dup function.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@162
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-box.c
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-image.c
+M      glabels2/src/label-line.c
+M      glabels2/src/label-text.c
+
+commit 7d676b96b7ee534ab36054be2febb8086eeef278
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    Includes support for flipping.
+    Added function for copying properties from one object to another.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@161
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+
+commit b5e19b10316c2fc38af47fbeed61405fa03bd1bb
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    New verbs and menu structure for flipping and rotation.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@160
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+
+commit 47583e96fce7f3637a4e842bfda43c5460354468
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    Preferences are now saved when view options are modified.
+    Includes new verbs for flipping and rotation.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@159
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui.c
+
+commit 3fa08fe5b70f25df787fe02e05c6a9d8f1b6f06f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-14
+
+    Fixed default-font-weight bug.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@158
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/prefs.c
+
+commit 2c55c7028acaeb1ecd61a5136afe3ac3d7e71db1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-12
+
+    All 2-pass labels have been converted to single-pass labels using
+    multiple layouts per sheet.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@157
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+
+commit 77fce21b253323abe15246dc980c5726ab6cc9fd
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-10
+
+    Changes to development plan.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@156
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/TODO
+
+commit 9b27951549f2ee5db410e25c0bf553fba8400196
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-10
+
+    Preferences and object property dialogs are now rebuilt if previously
+    destroyed rather than assuming they were cleanly closed.  This fixes
+    bug #619052.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@155
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view-object.h
+M      glabels2/src/view-text.c
+
+commit b35b62402a8c2d1c3919b63b3b1292150a247c93
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-09
+
+    Added handler for view's "pointer_exit" function:  clears cursor_info
+    label.
+    "zoom_changed" handler now updates zoom related verbs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@154
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/window.c
+
+commit 6f096754a43d01141efc1f9faf672dc698b1b174
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-09
+
+    Added gl_ui_update_zoom_verbs () function and added updates to zoom
+    verbs in the gl_ui_update_all () function.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@153
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+
+commit 7ef044ec2e605670f694e32f3658751b5b8caab2
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-09
+
+    Added "pointer_exit" signal.
+    Added gl_view_is_zoom_min () and gl_view_is_zoom_max () functions.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@152
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 25d14ad53a028feac7e2a39a364a031dabb62bd0
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-08
+
+    Added cursor position to status bar.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@151
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/window.c
+
+commit 8273d92363a6c41c6671599ce247fd1b0569a05b
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-08
+
+    Fixed incorrect usage of gtk_toggle_button_get_active() in
+    update_prefs_from_locale_page () -- must have cut-n-paste from a
+    strcmp based decision tree?
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@150
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/prefs-dialog.c
+
+commit 016bd5d0c97aacf3e5540ff0d794e08b8a76072a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-07
+
+    Initial status bar code -- only the zoom_info area implemented.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@149
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+M      glabels2/src/window.c
+M      glabels2/src/window.h
+
+commit e675919eedc4f9899fcdc596dc7be429e55670fa
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-05
+
+    Fixed coordinate system for rotated labels.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@147
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/print.c
+
+commit 3f9e4307f8cb9ab89da09952261ca0b5a7c544b9
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-05
+
+    Removed glabels.h artifact from POTFILES.in
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@146
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+
+commit 1cfc87be8f6d2e5b04144cbc73d84cb76dfce603
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-05
+
+    alert module merged into hig module.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@145
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+D      glabels2/src/alert.c
+D      glabels2/src/alert.h
+M      glabels2/src/file.c
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+
+commit 9be7b598f26a14fcca23836449a9e57c7222e0b2
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-05
+
+    Template origins are now the upper left corner rather than the
+    lower left.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@144
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+M      glabels2/src/print.c
+M      glabels2/src/print.h
+M      glabels2/src/template.c
+M      glabels2/src/wdgt-mini-preview.c
+
+commit c94df7e04ef6232c90c433ad796bd965b3a62b9c
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-10-03
+
+    Now original window propogates to open_ok() as object data.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@143
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/file.c
 
-commit d3a72579798314c893e9dd7b9c1dc0927f0a89f6
+commit 2e9d175e39ffc0c8cfb57f1ead14b42d79fe9e5a
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-09-18
+Date:  2002-10-03
 
-    2009-09-17 Jim Evins  <evins@snaught.com>
+    Fixed many problems with glabels-batch.  Still some problem with
+    semantics of n_sheets and n_copies.
 
-       * src/stock.c: (add_icons), (add_button_icon):
-               Use proper free function for GtkIconSource
-               (gtk_icon_source_free() not g_free()).
-               Patch provided by Christian Persch <chpe@gnome.org>.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@142
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-batch.c
+
+commit 689aebc4486bc8486f973687e78a301152353449
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-30
+
+    Changed version to 1.90.0 in preparation for next release.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@887
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@141
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/stock.c
+M      glabels2/configure.in
 
-commit d6ca76c9dbc400c5fb6d53a06213548ec06cb207
+commit 7dd8ab1633f9253b5b14617134b714c9ddd40569
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-09-10
+Date:  2002-09-30
 
-    2009-09-09 Jim Evins  <evins@snaught.com>
+    Made argv const to remove warning when passing to poptGetContext.
 
-       * configure.in:
-               Deleted help/C/Makefile.am.  Fixes "make dist".
-       * help/Makefile.am:
-               Removed trailing whitespace.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@140
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-batch.c
+
+commit 2cb116a55169a0e6730c39c334190a4f7d6cc28e
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-30
+
+    Added session management callbacks.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@881
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@139
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/configure.in
-M      glabels2/gtk-doc.make
-D      glabels2/help/C/Makefile.am
-M      glabels2/help/Makefile.am
+M      glabels2/src/glabels.c
 
-commit 6aa23570ca0b86c434a605f3c5a283a0f5d22e73
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-09-09
+commit 4cb93fd68e89d83fb7b8d173ed85287b6099fe30
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-29
 
-    Added a translation template for the documentation,
-    created with the latest xml2po version from gnome-doc-utils v0.17.3
+    This is the new SDI window module.
 
-    Updated German doc translation
 
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@138
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels2/src/window.c
+A      glabels2/src/window.h
+
+commit 568fc9114bf7feb474f1c1f0ad563f46b7fad9a5
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-29
+
+    Removed all remnants of MDI/BONOBO-MDI.  We now use an SDI application
+    model.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@879
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@137
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/help/de/de.po
-A      glabels2/help/glabels-help.pot
+M      glabels2/AUTHORS
+M      glabels2/TODO
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+D      glabels2/src/bonobo-mdi-child.c
+D      glabels2/src/bonobo-mdi-child.h
+D      glabels2/src/bonobo-mdi.c
+D      glabels2/src/bonobo-mdi.h
+M      glabels2/src/commands.c
+M      glabels2/src/commands.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/glabels.c
+D      glabels2/src/glabels.h
+D      glabels2/src/mdi-child.c
+D      glabels2/src/mdi-child.h
+D      glabels2/src/mdi.c
+D      glabels2/src/mdi.h
+M      glabels2/src/merge-properties.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs.c
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print-dialog.h
+M      glabels2/src/tools.c
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
 
-commit 681ec7dbf587319f53d3ce59e8e62ac3b16e476c
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-09-09
+commit 31a7e007b211fdcf5a4f2a6c33221f13401dba76
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-26
+
+    Added new template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@135
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/AUTHORS
+M      glabels2/data/predefined-labels.template
+
+commit 200f86cd136cb2efade9408858baebfcb1293f06
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-26
+
+    Added template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@134
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+M      glabels1/data/predefined-labels.template
+
+commit 1282b07f72de900661dc4b3d8d11efca5a314b00
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-25
+
+    view_text and view_barcode dialogs now track changes to label's
+    merge properties.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@133
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-object.c
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-bc-data.c
+M      glabels2/src/wdgt-bc-data.h
+M      glabels2/src/wdgt-text-entry.c
+M      glabels2/src/wdgt-text-entry.h
+
+commit 3d67bfa8cac66e625a4aa1d00c867215ed1cc9b9
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-23
+
+    Added callbacks to track "moved" signals of label objects and update
+    property dialogs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@132
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+
+commit af9ffce2cdf1661abfb7268bf5e96981ee7c4097
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-23
+
+    Additional dialogs and widgets migrated to use HIG module.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@131
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-image.c
+M      glabels2/src/wdgt-bc-data.c
+M      glabels2/src/wdgt-bc-data.h
+M      glabels2/src/wdgt-bc-props.c
+M      glabels2/src/wdgt-bc-props.h
+M      glabels2/src/wdgt-bc-style.c
+M      glabels2/src/wdgt-bc-style.h
+
+commit ffda9a42e2bc020470ddd824f3ae041c2ce9daa3
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-22
+
+    HIG applied to more dialogs.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@130
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/file.c
+M      glabels2/src/merge-properties.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-position.c
+M      glabels2/src/wdgt-size.c
+M      glabels2/src/wdgt-size.h
+M      glabels2/src/wdgt-text-entry.c
+M      glabels2/src/wdgt-text-entry.h
+M      glabels2/src/wdgt-vector.c
+M      glabels2/src/wdgt-vector.h
+
+commit f35c12acd7a9f4347fbcddf7a45263e281441faa
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-21
+
+    Incorporated use of HIG into prefs_dialog, view_text and related
+    widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@129
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/merge-properties.c
+M      glabels2/src/merge-properties.h
+M      glabels2/src/merge-ui.c
+M      glabels2/src/prefs-dialog.c
+M      glabels2/src/prefs-dialog.h
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
+M      glabels2/src/wdgt-fill.c
+M      glabels2/src/wdgt-fill.h
+M      glabels2/src/wdgt-line.c
+M      glabels2/src/wdgt-line.h
+M      glabels2/src/wdgt-position.c
+M      glabels2/src/wdgt-position.h
+M      glabels2/src/wdgt-text-entry.c
+M      glabels2/src/wdgt-text-entry.h
+M      glabels2/src/wdgt-text-props.c
+M      glabels2/src/wdgt-text-props.h
+
+commit 0386a5863488324dc75098d1cddca78afe34feb3
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-20
+
+    Removed generic full-page alias from predefined-templates, because
+    these are now generated in code automatically.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@128
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/data/predefined-labels.template
+
+commit eb61824324658f2711ae5c832a5ec954913c990c
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-20
+
+    Added additional signals to view object to support a status bar in
+    future releases.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@127
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/marshal.list
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit 6d7d332d28475ac2f27f4259b8f00ddc790da963
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-20
+
+    More refinements to HIG module.
+    New label and print dialogs along with associated widget now use
+    HIG module.
+    Full-page labels are now named "Generic %s full page."
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@126
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/file.c
+M      glabels2/src/hig.c
+M      glabels2/src/hig.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/template.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-media-select.h
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-copies.h
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-print-merge.h
+M      glabels2/src/wdgt-rotate-label.c
+M      glabels2/src/wdgt-rotate-label.h
+
+commit 2b89542781d98e153fd7269a23109f53e5cc6416
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-20
+
+    When creating origins for labels, y is now sorted in reverse.
+    Removed inappropriate freeing of pi->template in print_info_new().
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@125
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/hig.c
+M      glabels2/src/print.c
+M      glabels2/src/template.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+
+commit 8c77b29af12a139d89f8edf70ca6ae2458d516dd
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-19
+
+    Refinements to new label dialog and associated widgets.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@124
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/hig.h
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit a5323663beeb29d04dd85c1a3c0cb17bb12ce8ac
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-18
+
+    Added HIG module (hig.[ch]) to provide HIG inspired dialog and
+    layout tools.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@123
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/alert.c
+M      glabels2/src/alert.h
+M      glabels2/src/file.c
+A      glabels2/src/hig.c
+A      glabels2/src/hig.h
+
+commit d3f4831bec333b5e6726fbd87843e2bea56f5ca2
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-17
+
+    Code cleanup.  Mostly formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@122
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/mdi-child.c
+M      glabels2/src/mdi-child.h
+M      glabels2/src/mdi.c
+M      glabels2/src/mdi.h
+
+commit 3c77cbba3cb8456d4b54242c9b204159204e2ddf
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-17
+
+    Code cleanup.  Mostly formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@121
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label-barcode.c
+M      glabels2/src/label-barcode.h
+M      glabels2/src/label-box.c
+M      glabels2/src/label-box.h
+M      glabels2/src/label-ellipse.c
+M      glabels2/src/label-ellipse.h
+M      glabels2/src/label-image.c
+M      glabels2/src/label-image.h
+M      glabels2/src/label-line.c
+M      glabels2/src/label-line.h
+M      glabels2/src/label-object.c
+M      glabels2/src/label-object.h
+M      glabels2/src/label-text.c
+M      glabels2/src/label-text.h
+
+commit 13e4337ed16d3c8b2b41e2fa4bb3950ff0aa60d1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-17
+
+    Created mnemonics for spacing and border magic numbers.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@120
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/alert.c
+
+commit b284b4dd826a2f15ac82764f0438dba1da61e1ef
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-16
+
+    Misc. code cleanup.  Mostly formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@119
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/label.c
+M      glabels2/src/label.h
+
+commit 8d70e8fa1820def464881c72f0bf3c47c285234d
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-16
+
+    Assorted code cleanup.  Mostly formatting.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@118
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/alert.c
+M      glabels2/src/alert.h
+M      glabels2/src/bc-gnubarcode.c
+M      glabels2/src/bc-gnubarcode.h
+M      glabels2/src/bc-postnet.c
+M      glabels2/src/bc-postnet.h
+M      glabels2/src/bc.c
+M      glabels2/src/bc.h
+M      glabels2/src/canvas-hacktext.c
+M      glabels2/src/canvas-hacktext.h
+M      glabels2/src/color.c
+M      glabels2/src/color.h
+M      glabels2/src/commands.c
+M      glabels2/src/commands.h
+M      glabels2/src/debug.c
+M      glabels2/src/debug.h
+M      glabels2/src/file.c
+M      glabels2/src/file.h
+M      glabels2/src/glabels.c
+M      glabels2/src/glabels.h
+
+commit 26bbbd8b02ac36829fe272c10d502206a95322f0
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-15
+
+    Restructured template module to ultimately support multiple layouts
+    and markups.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@117
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/Makefile.am
+M      glabels2/src/label.c
+M      glabels2/src/prefs.h
+M      glabels2/src/print.c
+M      glabels2/src/template.c
+M      glabels2/src/template.h
+M      glabels2/src/view.c
+M      glabels2/src/wdgt-media-select.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-print-copies.c
+M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/wdgt-rotate-label.c
+
+commit 0e23ca635af5aad404969a1e204bb3eab41b3b7f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-13
+
+    Changed version to 1.89.2, in preparation for next release.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@116
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-    Removed unneeded whitespace from subject category in glabels.omf.in.
+M      glabels2/configure.in
 
-    Fixed some formatting bugs in glabels.xml.
+commit 77f8e365ea6d0dcc6ed5843a61c6f1855eb9708c
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-13
 
+    Moved all ui_component manipulation from mdi module to ui module.
+    gl_label_get_short_name() now removes ".glabels" extension.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@878
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@115
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/help/C/glabels.xml
-M      glabels2/help/glabels.omf.in
+M      glabels2/src/label.c
+M      glabels2/src/mdi.c
+M      glabels2/src/ui.c
+M      glabels2/src/ui.h
+M      glabels2/src/util.c
+M      glabels2/src/util.h
 
-commit fbdd5f00e6cde15930a2c9fd848bd8a6cc124208
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-09-08
+commit 72740304b5fe654527808d3f6044258072607b60
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-11
 
-    Added screenshots to German docs
+    Preparation for 0.4.6 build.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@875
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@114
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-A      glabels2/help/de/figures/main-window-empty.png
-A      glabels2/help/de/figures/merge-ex1-1.png
-A      glabels2/help/de/figures/merge-ex1-2.png
-A      glabels2/help/de/figures/merge-ex1-3.png
-A      glabels2/help/de/figures/merge-ex1-4.png
-A      glabels2/help/de/figures/merge-ex2-1.png
-A      glabels2/help/de/figures/merge-ex2-2.png
-A      glabels2/help/de/figures/merge-ex2-3.png
-A      glabels2/help/de/figures/merge-ex2-4.png
-A      glabels2/help/de/figures/object-editor-sidebar.png
-A      glabels2/help/de/figures/print-copies.png
-A      glabels2/help/de/figures/print-merge.png
+M      glabels1/configure.in
 
-commit e17c32e30a18a859fcf20bd5d1b8f791e7b2b946
-Author: Mario Blättermann <mariobl@gnome.org>
-Date:  2009-09-08
+commit 39b55bb6524feb82f3ca6c9e2f98ab7d60d006fd
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-11
 
-    Updated German doc translation
+    More screwing with build environment
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@874
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@113
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/help/de/de.po
-
-commit 26a4496bb2e3fe0a4320b68147a88e0e52673f7f
-Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
-Date:  2009-09-08
+M      glabels1/ABOUT-NLS
+M      glabels1/ChangeLog
+M      glabels1/Makefile.am
+M      glabels1/barcode-0.98/configure
+M      glabels1/doc/C/Makefile.in
+M      glabels1/doc/Makefile.in
+M      glabels1/macros/Makefile.in
+M      glabels1/po/ChangeLog
+M      glabels1/po/de.po
+M      glabels1/po/es.po
+M      glabels1/po/fr.po
+M      glabels1/po/glabels.pot
+M      glabels1/po/ja.po
+M      glabels1/po/pl.po
+M      glabels1/po/pt_BR.po
+M      glabels1/po/zh_TW.Big5.po
+
+commit d98d777fa92fccfc6cbdb5a6af4b3bef5fa4e8d5
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-10
 
-    Updated Russian translation
+    Fixed old format in APLI 1999.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@873
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@111
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/po/ru.po
+M      glabels1/data/predefined-labels.template
+M      glabels2/data/predefined-labels.template
 
-commit 86a8bb0c5f86a84dc85a8238cee4e4b4c2ec895f
+commit ae0eb02a3edd2d951ec8746ae49bba85a7c68f58
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-09-01
-
-    2009-08-31 Jim Evins  <evins@snaught.com>
+Date:  2002-09-10
 
-       * po/fr.po:
-               Updated french translation (Claude Paroz)
+    Additional label template acknowledgements.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@864
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@110
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/po/fr.po
+M      glabels2/AUTHORS
 
-commit 2fdeef77371533c7ae0f627fa14dd683616b8dd5
+commit eab514f92befda873f1063aa3bba749b62a77e08
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-20
-
-    2009-05-19 Jim Evins  <evins@snaught.com>
+Date:  2002-09-10
 
-       * configure.in:
-       * po/LINGUAS:
-               Moved translation list from configure.in to po/LINGUAS.
+    Additional label templates.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@853
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@109
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/configure.in
-A      glabels2/po/LINGUAS
+M      glabels1/data/predefined-labels.template
+M      glabels2/data/predefined-labels.template
 
-commit ad91b41ce563ebe5b0fcb2a86c02d23f697c3790
+commit b97c24634fc9db3ad474626986e8f37610c2f8ef
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-20
-
-    2009-05-19 Jim Evins  <evins@snaught.com>
+Date:  2002-09-10
 
-       * configure.in:
-       * po/zh_CN.po:
-               New Chinese translation (Careon
-               <zzbusagain@yahoo.com.cn>).
-       * AUTHORS:
-               Added above translation to acknowledgements.
+    Additional label acknowedgements.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@850
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@108
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/configure.in
-A      glabels2/po/zh_CN.po
+M      glabels1/AUTHORS
 
-commit d9d21f38de54637ea0713406beb5cfd93598369c
+commit fe555314711582397b57b806576b5e7cd7a32fb4
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-18
+Date:  2002-09-10
 
-    2009-05-18 Jim Evins  <evins@snaught.com>
-
-       * src/prefs-model.c: (gl_prefs_model_load_settings):
-               Make an educated guess at locale settings when run for the
-               first time.
+    Updated russian translations, thanks to Vitaly Lipatov
+    <LAV@VL3143.spb.edu>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@848
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@107
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/prefs-model.c
+M      glabels1/po/ru.po
 
-commit 19a05da1d464dc893cb20d959f1bf7ec150ad08b
+commit 570bb13750709ec3eaf631cb5efd6a3cf85612c0
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-18
+Date:  2002-09-10
+
+    Added 16x16 menu sized images for remainder of stock icons.
 
-    Deleting file that is unused with last checkin.
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@847
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@106
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-D      glabels2/help/C/glabels-C.omf
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_barcode_16.png
+A      glabels2/src/stock-pixmaps/stock_box_16.png
+A      glabels2/src/stock-pixmaps/stock_ellipse_16.png
+A      glabels2/src/stock-pixmaps/stock_image_16.png
+A      glabels2/src/stock-pixmaps/stock_line_16.png
+A      glabels2/src/stock-pixmaps/stock_merge_16.png
+A      glabels2/src/stock-pixmaps/stock_text_16.png
 
-commit 1ef96f18da1704ef0fc131366b456e6dfa345f01
+commit beb3e848d55c256418165cc1ed175577f9a78330
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-18
-
-    2009-05-17 Jim Evins  <evins@snaught.com>
+Date:  2002-09-10
 
-       * Makefile.am:
-       * configure.in:
-       * help/C/glabels-C.omf:
-       * help/C/glabels.xml:
-       * help/Makefile.am:
-       * help/de/de.po:
-       * help/glabels.omf.in:
-       * po/de.po:
-               Updated german translation, gnome-doc-utils support and
-               german translation of glabels manual (Mario Blättermann).
+    Added 16x16 menu sized images for remainder of stock icons.
+    Now uses g_free() instead of g_object_unref() on GtkIconSource --
+    it does not appear to be a GObject.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@844
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@105
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/Makefile.am
-M      glabels2/configure.in
-M      glabels2/help/C/glabels-C.omf
-M      glabels2/help/C/glabels.xml
-M      glabels2/help/Makefile.am
-A      glabels2/help/de/de.po
-A      glabels2/help/glabels.omf.in
-M      glabels2/po/de.po
+M      glabels2/src/stock.c
 
-commit d06758ddbbea33616952af7ed1f3518782e15361
+commit 9d2970c6cea4d63a62d7f53a14077be5cce6b7d2
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-02
-
-    2009-05-01 Jim Evins  <evins@purple>
+Date:  2002-09-09
 
-       * AUTHORS:
-       * configure.in:
-       * po/ca.po:
-               Added catalan translation (David Planella).
+    Cleaned-up 24x24 icons.  Added as binary files this time.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@842
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@104
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/configure.in
-A      glabels2/po/ca.po
+A      glabels2/src/stock-pixmaps/stock_arrow_24.png
+A      glabels2/src/stock-pixmaps/stock_barcode_24.png
+A      glabels2/src/stock-pixmaps/stock_box_24.png
+A      glabels2/src/stock-pixmaps/stock_ellipse_24.png
+A      glabels2/src/stock-pixmaps/stock_image_24.png
+A      glabels2/src/stock-pixmaps/stock_line_24.png
+A      glabels2/src/stock-pixmaps/stock_merge_24.png
+A      glabels2/src/stock-pixmaps/stock_text_24.png
 
-commit 4ce6f965c7c56a4be543898244fd8f330a3ecd24
+commit 773b3be17816ba9e5a1fe675d8c32aa3c224d498
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-05-01
+Date:  2002-09-09
+
+    These should be binary files.  Removing.
 
-    Release 2.2.5
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/tags/glabels-2_2_5@841
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@103
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-commit b26cfcc7d50b6980fae589120ccca4f2348642d0
-Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-30
+D      glabels2/src/stock-pixmaps/stock_arrow_24.png
+D      glabels2/src/stock-pixmaps/stock_barcode_24.png
+D      glabels2/src/stock-pixmaps/stock_box_24.png
+D      glabels2/src/stock-pixmaps/stock_ellipse_24.png
+D      glabels2/src/stock-pixmaps/stock_image_24.png
+D      glabels2/src/stock-pixmaps/stock_line_24.png
+D      glabels2/src/stock-pixmaps/stock_merge_24.png
+D      glabels2/src/stock-pixmaps/stock_text_24.png
 
-    2009-04-29 Jim Evins  <evins@purple>
+commit 19d085ed916b8652d2dd9fe3b18204bf6d66add8
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-09
 
-       * NEWS:
-       * configure.in:
-       * docs/libglabels/libglabels-decl-list.txt:
-       * gtk-doc.make:
-       * src/ui-commands.c: (gl_ui_cmd_help_about):
-               Prepare for 2.2.5 release.
+    Added 16x16 icon for GL_STOCK_ARROW
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@840
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@102
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/NEWS
-M      glabels2/configure.in
-M      glabels2/docs/libglabels/libglabels-decl-list.txt
-M      glabels2/gtk-doc.make
-M      glabels2/src/ui-commands.c
+M      glabels2/src/stock-pixmaps/Makefile.am
+A      glabels2/src/stock-pixmaps/stock_arrow_16.png
 
-commit b3db239b39cf13a96008574884f25f4c3e57d5c3
+commit ba5fd945cba4073b4947d9a072aaf63cbc712b80
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-30
-
-    2009-04-29 Jim Evins  <evins@purple>
+Date:  2002-09-09
 
-       * data/templates/avery-iso-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-       * data/templates/misc-us-templates.xml:
-               Make sure new descriptions are marked translatable.
+    Created add_icons() and added code to add both 24x24 and 16x16 icons
+    for a given stock id.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@839
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@101
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-iso-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
-M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/src/stock.c
 
-commit 4443dc5d0c2546a028a9cfef97d6ca40a3833d1c
+commit 3ccfe15fdc1e7820db6b4f4936a014dd01ee755e
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-30
+Date:  2002-09-08
 
-    2009-04-29 Jim Evins  <evins@purple>
-
-       * data/templates/avery-iso-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-       * data/templates/misc-us-templates.xml:
-               Caught up on user submitted templates.
-       * AUTHORS:
-               Acknowledgements for above templates.
+    Fixed capitalization in labels and tips.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@837
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@100
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-iso-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
-M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/src/glabels-ui.xml
 
-commit 23c906e6a07f047e932d1812be7668e1b312ad5f
+commit da26567e0080273482f19fc8116e5940a7271626
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-30
-
-    2009-04-29 Jim Evins  <evins@purple>
+Date:  2002-09-08
 
-       * po/de.po:
-               Updated german translation (Mario Blättermann).
+    Now uses the new XML parser from libxml.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@836
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@99
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-D      glabels2/po/ChangeLog
-M      glabels2/po/de.po
+M      glabels1/src/label.c
 
-commit 30da2882aea0fedfe88020c61dc642beee5a0a9d
+commit b6b9ceb0a16e3ab214ecfcbd7bb1f90db555ce29
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-29
-
-    2009-04-29 Jim Evins  <evins@purple>
+Date:  2002-09-08
 
-       * src/color.c: (gl_color_to_gdk_color), (gl_color_from_gdk_color):
-       * src/mygal/widget-color-combo.c: (color_combo_new):
-       * src/object-editor.c: (gl_object_editor_construct_color_combo):
-       * src/ui-property-bar.c:
-       (gl_ui_property_bar_construct_color_combo):
-               Bug #2760830.  Display correct preview color in color
-               combos when default
-               color selected.
+    Changed libxml requirement from 1.8.10 to 1.8.11 to enable the use
+    of the new XML parser.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@834
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@98
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/color.c
-M      glabels2/src/mygal/widget-color-combo.c
-M      glabels2/src/object-editor.c
-M      glabels2/src/ui-property-bar.c
+M      glabels1/configure.in
 
-commit 987a9259d51cfe2fbbed149ded2e93c92e0b17ad
+commit 9f3fc6353c66abc095b64de6b62b6ad83c853b9c
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-04-29
-
-    2009-04-28 Jim Evins  <evins@purple>
+Date:  2002-09-07
 
-       * data/glade/object-editor.glade:
-       * data/glade/prefs-dialog.glade:
-       * data/glade/property-bar.glade:
-       * data/glade/template-designer.glade:
-       * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct),
-       (first_spin_cb), (last_spin_cb):
-       * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct):
-               Zero out adjustment->page_size for all spinbuttons.
-               With gtk-2.14 this causes
-               many warning and with gtk-2.16 this actually breaks
-               the spinbuttons.
+    Added rotate and flip properties with default values to objects for
+    compatability with future versions.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@833
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@97
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/glade/object-editor.glade
-M      glabels2/data/glade/prefs-dialog.glade
-M      glabels2/data/glade/property-bar.glade
-M      glabels2/data/glade/template-designer.glade
-M      glabels2/src/wdgt-print-copies.c
-M      glabels2/src/wdgt-print-merge.c
+M      glabels2/src/xml-label.c
 
-commit ad51cdd46a8bdcb13c0bc4637e81a6d1e80de92c
+commit 81266e4d3be7a20712e9946d3014dcb35db2119f
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-01-08
-
-    2009-01-07 Jim Evins  <evins@snaught.com>
+Date:  2002-09-07
 
-       * src/critical-error-handler.c: (critical_error_handler):
-       * src/ui-commands.c: (gl_ui_cmd_help_contents):
-       * src/warning-handler.c: (warning_handler):
-       * src/view.c: (selection_received_cb):
-               Compile without warning with additional CFLAGS of
-               -O1 -Wall -Wformat=2.
+    Added view controls for drawing toolbar.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@822
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@96
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/critical-error-handler.c
-M      glabels2/src/ui-commands.c
-M      glabels2/src/view.c
-M      glabels2/src/warning-handler.c
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/mdi.c
+M      glabels2/src/prefs.c
+M      glabels2/src/prefs.h
 
-commit fad7d2c766ab31ac4f083557d6543ef30fa84115
+commit fc89f960f997273d08f66e6248d5dc9381b1bd61
 Author: Jim Evins <evins@snaught.com>
-Date:  2009-01-03
-
-    2009-01-02 Jim Evins  <evins@snaught.com>
+Date:  2002-09-07
 
-       * COPYING.README_FIRST:
-               Fixed typo.
+    Cleanup of selection code.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@820
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@95
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/COPYING.README_FIRST
-M      glabels2/ChangeLog
+M      glabels2/src/view.c
+M      glabels2/src/view.h
 
-commit 273e96234241a73a9e1f81de1ea691109025f189
+commit a8ff7374b838357bf095f00079fa72004008603a
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-28
-
-    2008-12-27 Jim Evins  <evins@snaught.com>
+Date:  2002-09-06
 
-       * data/templates/avery-iso-templates.xml:
-       * data/templates/avery-other-templates.xml:
-       * data/templates/avery-us-templates.xml:
-       * data/templates/brother-other-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-       * data/templates/misc-other-templates.xml:
-       * data/templates/zweckform-iso-templates.xml:
-               Make sure all descriptions are marked as translatable.
+    Renamed menus module to ui.
+    Added "selection_changed" signal to view.
+    Added adjustments to sensitivity of menu items based on selection
+    state.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@818
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@94
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-iso-templates.xml
-M      glabels2/data/templates/avery-other-templates.xml
-M      glabels2/data/templates/avery-us-templates.xml
-M      glabels2/data/templates/brother-other-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
-M      glabels2/data/templates/misc-other-templates.xml
-M      glabels2/data/templates/zweckform-iso-templates.xml
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+M      glabels2/src/mdi.c
+D      glabels2/src/menus.h
+R070   glabels2/src/menus.c    glabels2/src/ui.c
+A      glabels2/src/ui.h
+M      glabels2/src/view.c
 
-commit f7097587f69419775838221b7d93d2b84d10ca53
+commit 047594ad3ee781d2321ae81b1889b618771a4725
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-28
+Date:  2002-09-06
 
-    2008-12-27 Jim Evins  <evins@snaught.com>
+    Rearranged app menus.
+    Added "Object properties" and "raise/lower selection" to app menus.
+    Some cleanup of view.[ch]
 
-       * de.po:
-               Updated german translation (Mario Blättermann)
-       * AUTHORS:
-               Updated credits to reflect above translation.
-       * data/glade/object-editor.glade:
-       * data/glade/prefs-dialog.glade:
-       * data/glade/template-designer.glade:
-               Removed "translatable" attribute from whitespace strings,
-               which are used only to help layout.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@93
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/glabels-ui.xml
+M      glabels2/src/menus.c
+M      glabels2/src/tools.c
+M      glabels2/src/tools.h
+M      glabels2/src/view.c
+M      glabels2/src/view.h
+
+commit d50f26d829f665b021624ed83de4b4bea93f2c7c
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-05
+
+    Added additional alerts and information to existing alerts.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@816
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@92
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/glade/object-editor.glade
-M      glabels2/data/glade/prefs-dialog.glade
-M      glabels2/data/glade/template-designer.glade
-M      glabels2/po/de.po
+M      glabels2/src/file.c
 
-commit fcaa5234cf2768a9167bc29a2875c56a146017a9
+commit 7f819d54a20703d03c930d1455776dacee3252a5
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-22
-
-    2008-12-22 Jim Evins  <evins@snaught.com>
+Date:  2002-09-04
 
-       * NEWS:
-       * configure.in:
-               Prepare for 2.2.4 release.
+    Removed extraneous include.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@812
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@91
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/NEWS
-M      glabels2/configure.in
+M      glabels2/src/alert.h
 
-commit 1a93a81faad1793bf17bef90238180aa748ee2aa
+commit 8e701e7945f5aa67b12996889c5b5e57dcef56a3
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-22
+Date:  2002-09-04
 
-    2008-12-21 Jim Evins  <evins@snaught.com>
-
-       * data/templates/avery-us-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-               A couple of recent template submissions.
-       * AUTHORS:
-               Acknowledgements for above templates.
+    Moved HIG inspired alert dialog to its own module (alert.[ch])
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@810
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@90
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-us-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
+A      glabels2/src/alert.c
+A      glabels2/src/alert.h
 
-commit eb69c885bee022e5617b4c99e7f6b34de68965a3
+commit 1f96e4e8cf4e39298501708c269654283779b80b
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-21
+Date:  2002-09-04
 
-    2008-12-21 Jim Evins  <evins@snaught.com>
-
-       * src/view.c: (motion_notify_event_cb), (button_press_event_cb):
-               Don't check for handles on aggregate selections.
+    Replaced hardcoded object defaults with defaults from prefs module.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@808
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@89
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/view.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/color.c
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
 
-commit f87acc99c19ad66b78d6293e887412220a64f189
+commit 076dbabb5fc635eddd38a863379c5ebe5becd9b5
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-19
-
-    2008-12-18 Jim Evins  <evins@snaught.com>
+Date:  2002-09-04
 
-       * src/view.c: (selection_received_cb):
-               Fixed paste bug that caused a duplicate phantom
-               view_object to be created for
-               each new label_object.  This is because the view now
-               (as of r673) the view
-               monitiors the label for new objects and creates
-               view_objects automatically.
+    Moved color utilities to separate module (color.[ch])
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@803
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@88
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
+M      glabels2/po/POTFILES.in
+M      glabels2/src/Makefile.am
+A      glabels2/src/color.c
+A      glabels2/src/color.h
+M      glabels2/src/print-dialog.c
+M      glabels2/src/print.c
 M      glabels2/src/view.c
+M      glabels2/src/wdgt-bc-props.c
+M      glabels2/src/wdgt-fill.c
+M      glabels2/src/wdgt-line.c
+M      glabels2/src/wdgt-mini-preview.c
+M      glabels2/src/wdgt-text-props.c
 
-commit 033d3d8b724a44306ab3be30b26a39153d3b44bd
+commit 6d2286e67a93ba8c7572f47a457202a98136dd71
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-15
-
-    2008-12-14 Jim Evins  <evins@snaught.com>
+Date:  2002-09-04
 
-       * po/POTFILES.in:
-               Bug #2395628.  Reconciled POTFILES.in with current files.
+    Moved HIG inspired alert dialog to its own module (alert.[ch]).
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@802
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@87
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
 M      glabels2/po/POTFILES.in
 
-commit 85256c10a275c37d1efaa115840f0b7bb1f3d171
+commit 875fcf95a3cde43f575c76f5b402b0d72e9cd39b
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-15
-
-    2008-12-14 Jim Evins  <evins@snaught.com>
+Date:  2002-09-04
 
-       * src/ui.c: (gl_ui_new):
-               Bug #2395628.  Fixed i18n for application shell.
+    Moved HIG inspired alert dialog to its own module (alert.[ch]).
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@800
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@86
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/ui.c
+M      glabels2/src/Makefile.am
+M      glabels2/src/file.c
+M      glabels2/src/mdi.c
+M      glabels2/src/print.c
+M      glabels2/src/util.c
+M      glabels2/src/util.h
 
-commit c8f375d7e8aebd472353953976a629730c857978
+commit 803af36e65ebb3bf36eee95c95fba454d3f1b66d
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-12-15
-
-    2008-12-14 Jim Evins  <evins@snaught.com>
+Date:  2002-09-03
 
-       * configure.in:
-               Bug #2316013.  Added PKG_PROG_PKG_CONFIG.
+    Added GNOME_COMMON_INIT macro.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@798
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@85
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/configure.in
+M      glabels2/aclocal.m4
 
-commit b4abc77732a4daf5ada4cd4da0f945453380db7e
+commit 1762ac3c02393c943529ee331c102f094903c5ff
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-11-16
-
-    2008-11-15 Jim Evins  <evins@snaught.com>
+Date:  2002-09-03
 
-       * libglabels/db.c: (lgl_db_register_template):
-       * libglabels/xml-template.c:
-       (lgl_xml_template_parse_template_node):
-       * src/glabels-batch.c:
-       * src/view-text.c: (gl_view_text_create_button_press_event):
-               Fixed several issues such as possible use of uninitialized
-               variables found with "-O1 -Wall".
+    Added GNOME_PROGRAM_STANDARD_PROPERTIES.
+    Removed configuration artifacts from 0.4.x.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@795
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@84
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/libglabels/db.c
-M      glabels2/libglabels/xml-template.c
+M      glabels2/src/commands.c
 M      glabels2/src/glabels-batch.c
-M      glabels2/src/view-text.c
+M      glabels2/src/glabels.c
+M      glabels2/src/splash.c
+M      glabels2/src/template.c
 
-commit eab7333647b997218395f4f30a5a6a18705c7f7c
+commit d409fcb505f6db88e47b2a1ed4fdbda9d45515eb
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-11-10
+Date:  2002-09-03
 
-    2008-11-09 Jim Evins  <evins@snaught.com>
+    Added GNOME_COMMON_INIT macro.
+    Removed configuration artifacts from 0.4.x.
+    Added minimum Bonobo version.
 
-       * data/templates/misc-iso-templates.xml:
-               Another user submitted template.
 
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@83
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/acconfig.h
+M      glabels2/configure.in
+
+commit 4e09a8aa2cd791c88b13a6e2f93d07033fdfaeb6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-03
+
+    Had neglected to run some of the warning/error dialogs.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@793
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@82
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/templates/misc-iso-templates.xml
+M      glabels2/src/file.c
 
-commit 0fa94b3a05a329adf9ca6b52ca41b56b24e12766
+commit 131d154d86af37e82cb3baf1274fcab2706a4c63
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-10-28
-
-    2008-10-27 Jim Evins  <evins@snaught.com>
+Date:  2002-09-03
 
-       * data/templates/avery-us-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-       * data/templates/zweckform-iso-templates.xml:
-               Caught up on user submitted templates.
-       * AUTHORS:
-               Acknowledgements for above templates.
+    No longer changes labels filename and modification status if save
+    fails.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@789
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@81
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-us-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
-M      glabels2/data/templates/zweckform-iso-templates.xml
+M      glabels2/src/xml-label.c
 
-commit f3330ba8ef8348e17bcbb5f236507b94b92fb504
+commit e2c278742682530e40d174451830b17e5af89e0d
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-10-24
+Date:  2002-09-03
 
-    2008-10-23 Jim Evins  <evins@snaught.com>
+    Removed TAB from authors strings -- it caused a segfault w/ AA fonts.
 
-       * src/label-text.c: (set_font_family):
-       * src/object-editor-text-page.c:
-       (gl_object_editor_prepare_text_page),
-       (gl_object_editor_set_font_family):
-       * src/prefs-dialog.c: (construct_object_page),
-       (update_object_page_from_prefs):
-       * src/ui-property-bar.c: (gl_ui_property_bar_construct),
-       (reset_to_default_properties):
-       * src/util.c: (gl_util_get_font_family_list):
-       * src/util.h:
-               Bug #1902275 and Bug #2186214.  Cache font list so that
-               it is not re-created everytime
-               the list is requested.
-       * src/object-editor-text-page.c:
-       (gl_object_editor_set_font_family):
-               Don't change font-family if it hasn't actually changed.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@80
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/src/commands.c
+
+commit 6b512fc87989f66f777aed61540f7116ab6f7f99
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-09-03
+
+    Replaced gtk_message_dialogs with a custom dialog based on the HIG.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@787
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@79
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/label-text.c
-M      glabels2/src/object-editor-text-page.c
-M      glabels2/src/prefs-dialog.c
-M      glabels2/src/ui-property-bar.c
+M      glabels2/src/file.c
+M      glabels2/src/mdi.c
 M      glabels2/src/util.c
 M      glabels2/src/util.h
 
-commit 6bfe40b9f5e173eae0b7176e9d0ffe3191bd0201
+commit ee1d07bf8604c5b53544f2b4afa33f3388e6eafd
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-08-30
-
-    2008-08-29 Jim Evins  <evins@snaught.com>
+Date:  2002-09-03
 
-       * src/file.c: (gl_file_open), (gl_file_save_as):
-               Bug #2069668.  Corrected button order in Open and
-               "Save as"
-               dialogs.
+    Removed close from main toolbar.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@782
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@78
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/file.c
+M      glabels2/src/glabels-ui.xml
 
-commit 9d1db9a86dc38a2828d571e80d2a65f6d28c8ba1
+commit 2df2624a8e2ab2434dbf08f5bd326e6a8cb9ac85
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-08-19
-
-    2008-08-18 Jim Evins  <evins@snaught.com>
+Date:  2002-09-01
 
-       * NEWS:
-       * configure.in:
-       * docs/libglabels/tmpl/paper.sgml:
-               Prepare for 2.2.3 release.
+    Added ability to import from 0.4.x
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@779
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@77
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/NEWS
-M      glabels2/configure.in
-M      glabels2/docs/libglabels/tmpl/paper.sgml
-M      glabels2/gtk-doc.make
+M      glabels2/po/POTFILES.in
 
-commit 0cb3511ff16977b4bcaed8127929171ec8560f8d
+commit 715b07ac370161b9d267bb827425797300fefae7
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-08-17
+Date:  2002-09-01
 
-    2008-08-17 Jim Evins  <evins@snaught.com>
-
-       * data/dtd/glabels-2.2.dtd:
-       * data/templates/paper-sizes.xml:
-       * libglabels/db.c: (lgl_db_init):
-       * libglabels/paper.c: (lgl_paper_new), (lgl_paper_dup),
-       (lgl_paper_free):
-       * libglabels/paper.h:
-       * libglabels/xml-paper.c: (lgl_xml_paper_parse_paper_node):
-       * src/print-op.c: (set_page_size):
-               Bug #2049431.  Always explicitely set page size.
-               Added pwg_size field (PWG 5101.1-2002
-               size specification) to the libglabels paper database to
-               allow the page size to be
-               communicated to GtkPrintOp un-ambiguously.
+    Updated german translation, thanks to Christian Neumair
+    <christian-neumair@web.de>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@778
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@76
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/dtd/glabels-2.2.dtd
-M      glabels2/data/templates/paper-sizes.xml
-M      glabels2/libglabels/db.c
-M      glabels2/libglabels/paper.c
-M      glabels2/libglabels/paper.h
-M      glabels2/libglabels/xml-paper.c
-M      glabels2/src/print-op.c
+M      glabels2/po/de.po
 
-commit 1e2a5ab9232f284bda98dccaedb6016d6e5f2857
+commit 6702a0a49a3306f6ef7085fe4468cf560aeaa25c
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-07-26
-
-    2008-07-25 Jim Evins  <evins@snaught.com>
+Date:  2002-09-01
 
-       * src/object-editor-size-page.c: (size_reset_cb),
-       (gl_object_editor_set_max_size):
-               Bug #1993550.  Set size limits based on longest side
-               of label.
+    Updated german translation, thanks to Christian Neumair
+    <christian-neumair@web.de>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@775
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@75
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/object-editor-size-page.c
+M      glabels2/AUTHORS
 
-commit db3c2bd3a3b02e607ae60a08f01c2a50da66d7d3
+commit 2b92b4ab70d2ba3c5b186aa2d33b4e0f192afc30
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-07-20
-
-    2008-07-19 Jim Evins  <evins@snaught.com>
+Date:  2002-09-01
 
-       * configure.in:
-       * src/mygal/Makefile.am:
-               Make sure libtool handles library dependencies for mygal
-               properly.
+    Added capability to import files created w/ 0.4.x
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@773
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@74
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/configure.in
-M      glabels2/src/mygal/Makefile.am
+M      glabels2/src/Makefile.am
+A      glabels2/src/xml-label-04.c
+C056   glabels2/src/xml-label.h        glabels2/src/xml-label-04.h
+M      glabels2/src/xml-label.c
+M      glabels2/src/xml-label.h
 
-commit d7f7d6bd6d757805359b3e997e2978c0012f54a5
+commit 40377ed17a110bfdd5315a87728eeb8813d8ec66
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-05-22
-
-    2008-05-21 Jim Evins  <evins@snaught.com>
+Date:  2002-08-28
 
-       * src/glabels-batch.c: (main):
-               Bug #1968653.  Initialize prefs subsystem in
-               glabels-batch.
+    Reconciled text object alignment algorithm with view-text.c
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@771
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@73
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/glabels-batch.c
+M      glabels2/src/print.c
 
-commit 72928ecdf1b1560209e55c3d64fe6e3dfaa19604
+commit c5417dc935595eeda545d0007ac89122f2a534a3
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-05-10
-
-    2008-05-09 Jim Evins  <evins@snaught.com>
+Date:  2002-08-28
 
-       * data/glade/object-editor.glade:
-               Bug #1959135.  A couple of radio buttons somehow became
-               ungrouped.
+    Changed version to 1.89.1 for next build.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@770
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@72
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/glade/object-editor.glade
+M      glabels2/configure.in
 
-commit bff482ebb178677634fd8f1d00d3e777d52d7ba1
+commit ee93678898dff82a84fa47c5f749378b226401b5
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-04-05
+Date:  2002-08-27
 
-    2008-04-04 Jim Evins  <evins@snaught.com>
+    More screwing w/ build environment.
 
-       * data/templates/brother-other-templates.xml:
-               Added categories to existing templates.
-       * data/templates/misc-other-templates.xml:
-               Moved dymo templates to their own file.
-       * data/templates/Makefile.am:
-       * data/templates/dymo-other-templates.xml:
-               Additional dymo templates provided by Harald Welte
-               <laforge@gnumonks.org>.
-       * AUTHORS:
-               Acknowledgement for above templates.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@70
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/Makefile.am
+
+commit 97aa1f5682152f781e6f4e2ff6d6c04772ac308c
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-08-27
+
+    Still screwing with build environment.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@765
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@69
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/templates/Makefile.am
-M      glabels2/data/templates/brother-other-templates.xml
-A      glabels2/data/templates/dymo-other-templates.xml
-M      glabels2/data/templates/misc-other-templates.xml
+M      glabels2/barcode-0.98/Makefile.in
 
-commit 77e287c50a70b8f21c1f6168e109ede934eeea15
+commit 4412efca732464e1108e0ab55f1aa641864d9212
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-03-25
-
-    2008-03-24 Jim Evins  <evins@snaught.com>
+Date:  2002-08-27
 
-       * src/xml-label.c: (xml_doc_to_label):
-               Bug #1872584.  Don't refuse to parse label file if
-               namespace is
-               unrecognized -- it may be from a newer version of glabels.
+    Still skrewing with build environment.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@764
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@68
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/xml-label.c
+A      glabels2/barcode-0.98/Makefile.in
 
-commit da84fe8790466157cac18eed1895cffa20d316d4
+commit c670f3531e994cb52872171e4018c525c28cff49
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-03-16
-
-    2008-03-15 Jim Evins  <evins@snaught.com>
+Date:  2002-08-27
 
-       * data/templates/Makefile.am:
-       * data/templates/brother-other-templates.xml:
-               Added brother templates.
-       * src/cairo-markup-path.c: (gl_cairo_markup_margin_rect_path),
-       (gl_cairo_markup_margin_cd_path):
-       * src/view.c: (draw_markup_layer):
-               Fixed markup drawing errors when label is rotated.
+    Skrewing with the build environment.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@761
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@67
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/data/templates/Makefile.am
-A      glabels2/data/templates/brother-other-templates.xml
-M      glabels2/src/cairo-markup-path.c
-M      glabels2/src/view.c
+D      glabels2/po/Makefile.in.in
+D      glabels2/po/glabels.pot
 
-commit 00e91e339f4184c5af3f026db6da7cb704362fb7
+commit 2990a2608a2c5b56e1377c2d15020963b08efb3a
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-03-04
-
-    2008-03-03 Jim Evins  <evins@snaught.com>
+Date:  2002-08-27
 
-       * configure.in:
-       * ko.po:
-               Added korean translation provided by xein@naver.com.
+    Skrewing with the build environment.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@759
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@66
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
+M      glabels2/acconfig.h
+A      glabels2/acinclude.m4
+M      glabels2/aclocal.m4
+A      glabels2/autogen.sh
+D      glabels2/config.h.in
 M      glabels2/configure.in
-A      glabels2/po/ko.po
-
-commit 1af444dffebbf48dd36214aee5d2e7ed8e73c8ab
+D      glabels2/install-sh
+A      glabels2/macros/Makefile.am
+A      glabels2/macros/aclocal-include.m4
+A      glabels2/macros/autogen.sh
+A      glabels2/macros/compiler-flags.m4
+A      glabels2/macros/curses.m4
+A      glabels2/macros/gnome-bonobo-check.m4
+A      glabels2/macros/gnome-common.m4
+A      glabels2/macros/gnome-cxx-check.m4
+A      glabels2/macros/gnome-fileutils.m4
+A      glabels2/macros/gnome-gettext.m4
+A      glabels2/macros/gnome-ghttp-check.m4
+A      glabels2/macros/gnome-gnorba-check.m4
+A      glabels2/macros/gnome-guile-checks.m4
+A      glabels2/macros/gnome-libgtop-check.m4
+A      glabels2/macros/gnome-objc-checks.m4
+A      glabels2/macros/gnome-orbit-check.m4
+A      glabels2/macros/gnome-pilot.m4
+A      glabels2/macros/gnome-print-check.m4
+A      glabels2/macros/gnome-pthread-check.m4
+A      glabels2/macros/gnome-support.m4
+A      glabels2/macros/gnome-undelfs.m4
+A      glabels2/macros/gnome-vfs.m4
+A      glabels2/macros/gnome-x-checks.m4
+A      glabels2/macros/gnome-xml-check.m4
+A      glabels2/macros/gnome.m4
+A      glabels2/macros/gperf-check.m4
+A      glabels2/macros/linger.m4
+A      glabels2/macros/need-declaration.m4
+A      glabels2/macros/psiconv.m4
+M      glabels2/po/Makefile.in.in
+M      glabels2/po/glabels.pot
+D      glabels2/stamp-h.in
+
+commit c40f73c9fffc049f09d5f6f5bb1565277ae43c74
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-22
-
-    2008-02-21 Jim Evins  <evins@snaught.com>
+Date:  2002-08-26
 
-       * src/ui.c:
-               Last minute bug fix for 2.2.2 release.
-               Fixed typo that prevented "Save" from being deactivated
-               when
-               document is not modified.
+    Added translations from 0.4.5.  Only a fraction of the strings
+    are up-to-date.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@754
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@65
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/ui.c
+A      glabels2/po/es.po
+A      glabels2/po/pl.po
+A      glabels2/po/ru.po
+A      glabels2/po/zh_TW.Big5.po
 
-commit c7b72805e8f9e88c788dcd8cb599b11515fac170
+commit 977b2272d62424ffc272d48aabcd38a9e37cdf3b
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-22
+Date:  2002-08-26
 
-    2008-02-21 Jim Evins  <evins@snaught.com>
-
-       * NEWS:
-       * configure.in:
-               Prepare for 2.2.2 release.
+    Removed configure from CVS.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@753
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@64
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/NEWS
+M      glabels2/AUTHORS
+D      glabels2/configure
 M      glabels2/configure.in
+M      glabels2/po/POTFILES.in
+M      glabels2/po/de.po
+M      glabels2/po/fr.po
+M      glabels2/po/glabels.pot
+M      glabels2/po/ja.po
+M      glabels2/po/pt_BR.po
 
-commit 104d0092d40b8bbfef6eb417fdf9ee9c568ab7e3
+commit ef9184a8d24739952072b0b36798cd27832f9515
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-19
-
-    2008-02-18 Jim Evins  <evins@snaught.com>
+Date:  2002-08-26
 
-       * src/prefs-model.c: (gl_prefs_model_save_settings),
-       (gl_prefs_model_load_settings):
-               Set default units for file output.
+    Added stock images to help menu items.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@751
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@63
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/prefs-model.c
+M      glabels2/src/glabels-ui.xml
 
-commit ef2d442e373bf8f26ff49f1d9e2e4415d3690d15
+commit 0120f8c8e53c2a3a56c73d732305b0e061303d17
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-18
-
-    2008-02-18 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * help/C/glabels.xml:
-               Fixed example template.
+    Reconciled label acknowledgments with 0.4.5.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@749
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@62
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/help/C/glabels.xml
+M      glabels2/AUTHORS
 
-commit df63b87a2eb63897873851c61c1200334aaccfcb
+commit d154d0c0094506b62760d929030614e7d98c76e6
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-17
-
-    2008-02-16 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * AUTHORS:
-       * data/templates/avery-iso-templates.xml:
-       * data/templates/avery-us-templates.xml:
-       * data/templates/misc-iso-templates.xml:
-       * data/templates/misc-us-templates.xml:
-               Caught up on user submitted templates.
+    Reconciled predefined labels with 0.4.5.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@747
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@61
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/data/templates/avery-iso-templates.xml
-M      glabels2/data/templates/avery-us-templates.xml
-M      glabels2/data/templates/misc-iso-templates.xml
-M      glabels2/data/templates/misc-us-templates.xml
+M      glabels2/data/predefined-labels.template
 
-commit bb17382205e5bae69c7dc96e394b2da864ef3645
+commit ea716fa1d1cfce77cb991fec2ac3ca2f37aa5a4e
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-05
-
-    2008-02-04 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * src/view-image.c: (update_object_from_editor_cb):
-               Bug #1886438.  Don't update the image size unless it
-               is actually
-               triggered by a change in image source.  The result of
-               this bug
-               was that any attempt to edit the size spinboxes,
-               immediately
-               reset the size.
+    Added gl_view_raise_fg() to keep foreground objects on top.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@745
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@60
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/view-image.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
 
-commit cd2b98740455cb7a60925aa093fce003ecc8be81
+commit 262192e1efcac9209a70417db855de98d6a834a2
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-03
-
-    2008-02-03 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * src/label-image.c: (gl_label_image_class_init), (set_size):
-               Enforce minimum size for images.
+    Added foreground label outlines.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@744
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@59
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/label-image.c
+M      glabels2/src/view-object.c
+M      glabels2/src/view.c
+M      glabels2/src/view.h
 
-commit 16f9c5076bfe01daba6a98a6572cee8e69d6375e
+commit 6320b644115c2c0b78cc68794b482aec3db5a8ac
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-03
-
-    2008-02-03 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * src/object-editor-lsize-page.c:
-       (gl_object_editor_set_max_lsize):
-       * src/object-editor-private.h:
-       * src/object-editor-shadow-page.c:
-       (gl_object_editor_set_max_shadow_offset):
-       * src/object-editor-size-page.c: (gl_object_editor_set_max_size):
-       * src/object-editor.c: (gl_object_editor_finalize),
-       (gl_object_editor_new), (gl_object_notebook_construct_valist),
-       (label_changed_cb):
-       * src/object-editor.h:
-       * src/ui-sidebar.c: (gl_ui_sidebar_construct):
-       * src/view-barcode.c: (construct_properties_editor):
-       * src/view-box.c: (construct_properties_editor):
-       * src/view-ellipse.c: (construct_properties_editor):
-       * src/view-image.c: (construct_properties_editor):
-       * src/view-line.c: (construct_properties_editor):
-       * src/view-object.c: (gl_view_object_finalize):
-       * src/view-text.c: (construct_properties_editor):
-               Move update_editor_from_label callback from individual
-               view objects
-               to the object editor, so that signals can be disconnected
-               when
-               object editor is finalized.
-       * src/view-text.c: (gl_view_text_create_button_press_event):
-               Fixed bug that caused multiple view objects to be created
-               for a
-               single text object.  This bug would manifest itself as
-               a crash
-               when deleting multi-object selections which included
-               text objects.
+    Now unlinks output file to prevent an attempt to pop-up a dialog
+    asking to remove it -- since we don't do a gnome_init, this would
+    segfault.
+    Added a setlocale at initialization.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@742
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@57
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/object-editor-lsize-page.c
-M      glabels2/src/object-editor-private.h
-M      glabels2/src/object-editor-shadow-page.c
-M      glabels2/src/object-editor-size-page.c
-M      glabels2/src/object-editor.c
-M      glabels2/src/object-editor.h
-M      glabels2/src/ui-sidebar.c
-M      glabels2/src/view-barcode.c
-M      glabels2/src/view-box.c
-M      glabels2/src/view-ellipse.c
-M      glabels2/src/view-image.c
-M      glabels2/src/view-line.c
-M      glabels2/src/view-object.c
-M      glabels2/src/view-text.c
+M      glabels1/src/glabels_batch.c
 
-commit 975cf2793e52a80c09f558064e0987d238b99edf
+commit f488ddcd9c3a3ff60e25a9f98b4b5b6219c28864
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-02-01
-
-    2008-01-31 Jim Evins  <evins@snaught.com>
+Date:  2002-08-25
 
-       * src/label-barcode.c: (draw_object):
-               Fixed rendering problem when "Invalid data" is displayed
-               when text
-               object is lower in stacking order.
+    Additional label templates.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@739
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@56
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/label-barcode.c
+M      glabels1/AUTHORS
+M      glabels1/data/predefined-labels.template
 
-commit 4908a24dc1a5d597a853a4806e791f78b522fafd
+commit efbdf799f29c02a8933c8102af43847603dc82d8
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-31
+Date:  2002-08-25
 
-    2008-01-30 Jim Evins  <evins@snaught.com>
+    Added polish translations submitted by Arkadiusz Lipiec
+    <A.Lipiec@elka.pw.edu.pl>.
 
-       * src/label-text.c: (get_size), (draw_object), (draw_shadow):
-               Don't turn off cairo_hint_metrics.  This causes serious
-               issues with
-               bitmap fonts.
 
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@55
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+M      glabels1/configure.in
+A      glabels1/po/pl.po
+
+commit 2bdecc249c87e1513a6c27404e79058e8e61be3a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-08-25
+
+    Added chinese (zh_TW.Big5) translations submitted by Shell, Hin-lik
+    Hung <shell@home.shellhung.org>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@737
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@54
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/label-text.c
+M      glabels1/configure.in
+A      glabels1/po/zh_TW.Big5.po
 
-commit c173c24c951943fbdf0a5ecf35b84815ac736fcb
+commit 12a432eefc8f1b5a0166e39b72d638358036e204
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-30
-
-    2008-01-29 Jim Evins  <evins@snaught.com>
+Date:  2002-08-24
 
-       * src/print-op.c: (gl_print_op_construct),
-       (gl_print_op_construct_batch), (set_page_size):
-               Explicitly set page size for "other" page sizes.
+    Replaced gdk_mbstowcs with mbstowcs from stdlib.h. Gdk_mbstowcs is
+    broken in locales that do not use multi-byte characters and any LC_*
+    environmental variables are set.  This caused problems for Mandrake
+    8.x users (and probably others too).
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@735
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@53
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/print-op.c
+M      glabels1/src/hack.c
 
-commit 28c8daaa0657de9c8894a5c9bbad604c8a8a6013
+commit ea69a794bd98b9fa327f20b3a288d71ed7565d1f
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-26
-
-    2008-01-25 Jim Evins  <evins@snaught.com>
+Date:  2002-08-24
 
-       * src/bc.c:
-               Fixed Code128C backend parameters.
-       * src/label-barcode.c: (get_size):
-               Bug #1766425.  If barcode is not renderable with either
-               input data or default data, use a default size.  Also
-               fixed small leak.
+    Changed version in preparation for 0.4.5.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@732
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@52
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/bc.c
-M      glabels2/src/label-barcode.c
+M      glabels1/configure.in
 
-commit 5042beae2d6a1d83f2d0178fe97636b99bedde17
+commit 198960004f4ccabf2a2485fb803f59e33192b2dd
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-23
-
-    2008-01-22 Jim Evins  <evins@snaught.com>
+Date:  2002-08-24
 
-       * NEWS:
-       * configure.in:
-               Preparation for 2.2.1 release.
+    Changed TODO to reflect that current efforts are on the 2.0 codebase.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@728
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@51
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/NEWS
-M      glabels2/configure.in
+M      glabels1/TODO
 
-commit 147a21ba6c21f68b40654752182f6bbf55d06f2a
+commit 841ca2ab492e342989338eb4ef485ff8d8d3a0ad
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-17
+Date:  2002-08-24
 
-    2008-01-16 Jim Evins  <evins@snaught.com>
-
-       * src/print.c: (print_label):
-               Bug #1872568.  Don't apply special transforms (rotate and
-               mirror) to clipping region or outline.
+    Removed .gmo files from CVS.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@726
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@50
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/print.c
+D      glabels1/po/de.gmo
+D      glabels1/po/es.gmo
+D      glabels1/po/fr.gmo
+D      glabels1/po/ja.gmo
+D      glabels1/po/pt_BR.gmo
 
-commit 512e3c088acd3f8a14d8152f7318cbbf17a3cdd8
+commit 5774e7a6a5c50f5830d1b3b34b1a9d713ad02b80
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-02
+Date:  2002-08-24
 
-    2008-01-01 Jim Evins  <evins@snaught.com>
-
-       * src/util.c:
-               Sort font lists alphabetically.
+    Updated japanese translations submitted by Takeshi Aihana
+    <aihana@gnome.gr.jp>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@724
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@49
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/util.c
+M      glabels1/po/ja.po
 
-commit 655ca82e016d106d6d884ef2caf8f0434f14221a
+commit 70f2265289a107abd5564ece58adf22219e2285e
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-02
-
-    2008-01-01 Jim Evins  <evins@snaught.com>
+Date:  2002-08-24
 
-       * src/merge-evolution.c:
-               Do a case-insensitive sort.
+    Added russian translations submitted by Vitaly Lipatov
+    <LAV@VL3143.spb.edu>.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@722
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@48
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/src/merge-evolution.c
+M      glabels1/AUTHORS
+M      glabels1/configure.in
+A      glabels1/po/ru.po
 
-commit 84dd6ce9eb82d51fefcc0f77a104adbf786feea1
+commit d2d63a08021ef50eff2d98b5f5d6e4973a361577
 Author: Jim Evins <evins@snaught.com>
-Date:  2008-01-02
+Date:  2002-08-24
 
-    2008-01-01 Jim Evins  <evins@snaught.com>
+    Makefile.in should not be in CVS.
 
-       * src/merge-evolution.c:
-               Sort evolution by "file_under" field.  Original patch
-               provided
-               by Peter Cherriman <glabels-devel2712@bubieyehyeh.me.uk>
-               in
-               Patch #1860423.
-       * AUTHORS:
-               Added acknowledgement for above patch.
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@47
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels2/barcode-0.98/Makefile.in
+
+commit 893b8caa6be07c5e0621afbe3e698e74419807e5
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-08-24
+
+    Makefile.in should not be in CVS.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@720
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@46
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/AUTHORS
-M      glabels2/ChangeLog
-M      glabels2/src/merge-evolution.c
+D      glabels2/Makefile.in
+D      glabels2/src/Makefile.in
+D      glabels2/src/pixmaps/Makefile.in
+D      glabels2/src/stock-pixmaps/Makefile.in
 
-commit dce85299fd3989e6636675c39317c7280592d86b
+commit 8b0fc0a0d2be983a5e663b720a626e39a376c0a7
 Author: Jim Evins <evins@snaught.com>
-Date:  2007-12-25
-
-    2007-12-25 Jim Evins  <evins@snaught.com>
+Date:  2002-08-24
 
-       * glabels.spec.in:
-               Fix spec file.
+    No longer emits "changed" when initially clicking the font family
+    combobox.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@715
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@45
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-M      glabels2/glabels.spec.in
+M      glabels2/src/wdgt-text-props.c
 
-commit c8dd36d8d3c61487c28560d11f52310d655ab72a
+commit 84a5fe2c73ed0ecd311133364f5e53d336cdc122
 Author: Jim Evins <evins@snaught.com>
-Date:  2007-12-25
-
-    2007-12-25 Jim Evins  <evins@snaught.com>
+Date:  2002-08-23
 
-       * MESSAGE-OF-DOOM:
-               Removed for 2.2 stable branch.
-       * Makefile.am:
-       * NEWS:
-       * configure.in:
-               Prepare for 2.2.0 release.
+    Changed event->button.* to event->motion.* when handling
+    GTK_MOTION_NOTIFY events.
 
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@714
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@44
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-M      glabels2/ChangeLog
-D      glabels2/MESSAGE-OF-DOOM
-M      glabels2/Makefile.am
-M      glabels2/NEWS
-M      glabels2/configure.in
+M      glabels2/src/view-barcode.c
+M      glabels2/src/view-box.c
+M      glabels2/src/view-ellipse.c
+M      glabels2/src/view-highlight.c
+M      glabels2/src/view-image.c
+M      glabels2/src/view-line.c
+M      glabels2/src/view-text.c
 
-commit ea75118a021e733fa7e2281456581dab61d9c811
+commit b9ef933e41e55b79e7fb7c906810923082ad326d
 Author: Jim Evins <evins@snaught.com>
-Date:  2007-12-25
+Date:  2002-08-23
+
+    Removed cvswrappers.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@43
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels2/Makefile.in
+M      glabels2/barcode-0.98/doc/barcode.info
+M      glabels2/barcode-0.98/doc/barcode.pdf
+M      glabels2/barcode-0.98/doc/barcode.ps
+M      glabels2/barcode-0.98/doc/barcodedoc.txt
+D      glabels2/cvswrappers
+M      glabels2/src/Makefile.in
+M      glabels2/src/pixmaps/Makefile.in
+M      glabels2/src/stock-pixmaps/Makefile.in
+
+commit c1f2e6b6e372d0f62945aa26835780039ead7907
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-08-21
+
+    Initial revision
 
-    Creating glabels-2.2 branch.
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@713
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@39
     f5e0f49d-192f-0410-a22d-a8d8700d0965
 
 A      glabels2/AUTHORS
 A      glabels2/COPYING
-A      glabels2/COPYING-DOCS
-A      glabels2/COPYING-LIBGLABELS
-A      glabels2/COPYING.README_FIRST
 A      glabels2/ChangeLog
 A      glabels2/INSTALL
-A      glabels2/MESSAGE-OF-DOOM
 A      glabels2/Makefile.am
+A      glabels2/Makefile.in
 A      glabels2/NEWS
 A      glabels2/README
 A      glabels2/TODO
-A      glabels2/autogen.sh
+A      glabels2/acconfig.h
+A      glabels2/aclocal.m4
 A      glabels2/barcode-0.98/COPYING
 A      glabels2/barcode-0.98/ChangeLog
 A      glabels2/barcode-0.98/INSTALL
-A      glabels2/barcode-0.98/Makefile.am
-A      glabels2/barcode-0.98/Makefile.in.dist
+A      glabels2/barcode-0.98/Makefile.in
 A      glabels2/barcode-0.98/README
-A      glabels2/barcode-0.98/README.glabels
 A      glabels2/barcode-0.98/TODO
 A      glabels2/barcode-0.98/barcode.h
 A      glabels2/barcode-0.98/barcode.spec
@@ -2799,7 +25024,7 @@ A        glabels2/barcode-0.98/code93.c
 A      glabels2/barcode-0.98/compat/getopt.c
 A      glabels2/barcode-0.98/compat/getopt.h
 A      glabels2/barcode-0.98/configure
-A      glabels2/barcode-0.98/configure.in.dist
+A      glabels2/barcode-0.98/configure.in
 A      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
 A      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
 A      glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
@@ -2838,179 +25063,60 @@ A     glabels2/barcode-0.98/pcl.c
 A      glabels2/barcode-0.98/plessey.c
 A      glabels2/barcode-0.98/ps.c
 A      glabels2/barcode-0.98/sample.c
+A      glabels2/config.h.in
+A      glabels2/configure
 A      glabels2/configure.in
-A      glabels2/data/Makefile.am
-A      glabels2/data/desktop/Makefile.am
-A      glabels2/data/desktop/glabels.desktop.in
-A      glabels2/data/dtd/Makefile.am
-A      glabels2/data/dtd/glabels-2.2.dtd
-A      glabels2/data/glade/Makefile.am
-A      glabels2/data/glade/merge-properties-dialog.glade
-A      glabels2/data/glade/new-label-dialog.glade
-A      glabels2/data/glade/object-editor.glade
-A      glabels2/data/glade/prefs-dialog.glade
-A      glabels2/data/glade/print-custom-widget.glade
-A      glabels2/data/glade/property-bar.glade
-A      glabels2/data/glade/template-designer.glade
-A      glabels2/data/glade/wdgt-media-select.glade
-A      glabels2/data/glade/wdgt-rotate-label.glade
-A      glabels2/data/man/Makefile.am
-A      glabels2/data/man/glabels.1
-A      glabels2/data/mime/Makefile.am
-A      glabels2/data/mime/glabels.applications
-A      glabels2/data/mime/glabels.keys.in
-A      glabels2/data/mime/glabels.mime
-A      glabels2/data/mime/glabels.xml.in
-A      glabels2/data/pixmaps/Makefile.am
-A      glabels2/data/pixmaps/ex-1layout.png
-A      glabels2/data/pixmaps/ex-2layouts.png
-A      glabels2/data/pixmaps/ex-cd-size.png
-A      glabels2/data/pixmaps/ex-rect-size.png
-A      glabels2/data/pixmaps/ex-round-size.png
-A      glabels2/data/pixmaps/glabels-about-logo.png
-A      glabels2/data/pixmaps/glabels-application-x-glabels.png
-A      glabels2/data/pixmaps/glabels-splash.png
-A      glabels2/data/pixmaps/glabels.png
-A      glabels2/data/templates/Makefile.am
-A      glabels2/data/templates/avery-iso-templates.xml
-A      glabels2/data/templates/avery-other-templates.xml
-A      glabels2/data/templates/avery-us-templates.xml
-A      glabels2/data/templates/categories.xml
-A      glabels2/data/templates/misc-iso-templates.xml
-A      glabels2/data/templates/misc-other-templates.xml
-A      glabels2/data/templates/misc-us-templates.xml
-A      glabels2/data/templates/paper-sizes.xml
-A      glabels2/data/templates/zweckform-iso-templates.xml
-A      glabels2/docs/Makefile.am
-A      glabels2/docs/libglabels/Makefile.am
-A      glabels2/docs/libglabels/libglabels-decl-list.txt
-A      glabels2/docs/libglabels/libglabels-docs.sgml
-A      glabels2/docs/libglabels/libglabels-overrides.txt
-A      glabels2/docs/libglabels/libglabels-sections.txt
-A      glabels2/docs/libglabels/libglabels-undocumented.txt
-A      glabels2/docs/libglabels/libglabels.types
-A      glabels2/docs/libglabels/tmpl/category.sgml
-A      glabels2/docs/libglabels/tmpl/db.sgml
-A      glabels2/docs/libglabels/tmpl/enums.sgml
-A      glabels2/docs/libglabels/tmpl/libglabels-unused.sgml
-A      glabels2/docs/libglabels/tmpl/libglabels.sgml
-A      glabels2/docs/libglabels/tmpl/paper.sgml
-A      glabels2/docs/libglabels/tmpl/str.sgml
-A      glabels2/docs/libglabels/tmpl/template.sgml
-A      glabels2/docs/libglabels/tmpl/xml-category.sgml
-A      glabels2/docs/libglabels/tmpl/xml-paper.sgml
-A      glabels2/docs/libglabels/tmpl/xml-template.sgml
-A      glabels2/docs/libglabels/tmpl/xml.sgml
+A      glabels2/cvswrappers
+A      glabels2/data/predefined-labels.template
+A      glabels2/glabels.desktop
 A      glabels2/glabels.spec.in
-A      glabels2/gtk-doc.make
-A      glabels2/help/C/Makefile.am
-A      glabels2/help/C/figures/glabels-template-cd.png
-A      glabels2/help/C/figures/glabels-template-label.png
-A      glabels2/help/C/figures/glabels-template-layout.png
-A      glabels2/help/C/figures/main-window-empty.png
-A      glabels2/help/C/figures/merge-ex1-1.png
-A      glabels2/help/C/figures/merge-ex1-2.png
-A      glabels2/help/C/figures/merge-ex1-3.png
-A      glabels2/help/C/figures/merge-ex1-4.png
-A      glabels2/help/C/figures/merge-ex2-1.png
-A      glabels2/help/C/figures/merge-ex2-2.png
-A      glabels2/help/C/figures/merge-ex2-3.png
-A      glabels2/help/C/figures/merge-ex2-4.png
-A      glabels2/help/C/figures/object-editor-sidebar.png
-A      glabels2/help/C/figures/print-copies.png
-A      glabels2/help/C/figures/print-merge.png
-A      glabels2/help/C/glabels-C.omf
-A      glabels2/help/C/glabels.xml
-A      glabels2/help/C/legal.xml
-A      glabels2/help/Makefile.am
-A      glabels2/iec16022-0.2.1/BUGS
-A      glabels2/iec16022-0.2.1/CHANGELOG
-A      glabels2/iec16022-0.2.1/CREDITS
-A      glabels2/iec16022-0.2.1/INSTALL
-A      glabels2/iec16022-0.2.1/LICENSE
-A      glabels2/iec16022-0.2.1/Makefile.am
-A      glabels2/iec16022-0.2.1/Makefile.dist
-A      glabels2/iec16022-0.2.1/README
-A      glabels2/iec16022-0.2.1/README.glabels
-A      glabels2/iec16022-0.2.1/TODO
-A      glabels2/iec16022-0.2.1/iec16022.1
-A      glabels2/iec16022-0.2.1/iec16022.c
-A      glabels2/iec16022-0.2.1/iec16022ecc200.c
-A      glabels2/iec16022-0.2.1/iec16022ecc200.h
-A      glabels2/iec16022-0.2.1/image.c
-A      glabels2/iec16022-0.2.1/image.h
-A      glabels2/iec16022-0.2.1/reedsol.c
-A      glabels2/iec16022-0.2.1/reedsol.h
-A      glabels2/iec16022-0.2.1/test/testsuite-example.bin
-A      glabels2/iec16022-0.2.1/test/testsuite-example.eps
-A      glabels2/iec16022-0.2.1/test/testsuite-example.hex
-A      glabels2/iec16022-0.2.1/test/testsuite-example.png
-A      glabels2/iec16022-0.2.1/test/testsuite-example.text
-A      glabels2/iec16022-0.2.1/test/testsuite.sh
-A      glabels2/libglabels/Makefile.am
-A      glabels2/libglabels/category.c
-A      glabels2/libglabels/category.h
-A      glabels2/libglabels/db.c
-A      glabels2/libglabels/db.h
-A      glabels2/libglabels/enums.h
-A      glabels2/libglabels/libglabels-private.h
-A      glabels2/libglabels/libglabels.h
-A      glabels2/libglabels/libglabels.pc.in
-A      glabels2/libglabels/paper.c
-A      glabels2/libglabels/paper.h
-A      glabels2/libglabels/str.c
-A      glabels2/libglabels/str.h
-A      glabels2/libglabels/template.c
-A      glabels2/libglabels/template.h
-A      glabels2/libglabels/xml-category.c
-A      glabels2/libglabels/xml-category.h
-A      glabels2/libglabels/xml-paper.c
-A      glabels2/libglabels/xml-paper.h
-A      glabels2/libglabels/xml-template.c
-A      glabels2/libglabels/xml-template.h
-A      glabels2/libglabels/xml.c
-A      glabels2/libglabels/xml.h
+A      glabels2/install-sh
+A      glabels2/missing
+A      glabels2/mkinstalldirs
+A      glabels2/pixmaps/glabels-about-logo.png
+A      glabels2/pixmaps/glabels-icon.png
+A      glabels2/pixmaps/glabels-logo.png
 A      glabels2/po/ChangeLog
+A      glabels2/po/Makefile.in.in
 A      glabels2/po/POTFILES.in
-A      glabels2/po/cs.po
 A      glabels2/po/de.po
-A      glabels2/po/eo.po
-A      glabels2/po/es.po
 A      glabels2/po/fr.po
-A      glabels2/po/it.po
+A      glabels2/po/glabels.pot
 A      glabels2/po/ja.po
-A      glabels2/po/pl.po
 A      glabels2/po/pt_BR.po
-A      glabels2/po/ru.po
-A      glabels2/po/zh_TW.Big5.po
 A      glabels2/src/Makefile.am
-A      glabels2/src/base64.c
-A      glabels2/src/base64.h
+A      glabels2/src/Makefile.in
 A      glabels2/src/bc-gnubarcode.c
 A      glabels2/src/bc-gnubarcode.h
-A      glabels2/src/bc-iec16022.c
-A      glabels2/src/bc-iec16022.h
 A      glabels2/src/bc-postnet.c
 A      glabels2/src/bc-postnet.h
 A      glabels2/src/bc.c
 A      glabels2/src/bc.h
-A      glabels2/src/cairo-ellipse-path.c
-A      glabels2/src/cairo-ellipse-path.h
-A      glabels2/src/cairo-label-path.c
-A      glabels2/src/cairo-label-path.h
-A      glabels2/src/cairo-markup-path.c
-A      glabels2/src/cairo-markup-path.h
-A      glabels2/src/color.c
-A      glabels2/src/color.h
-A      glabels2/src/critical-error-handler.c
-A      glabels2/src/critical-error-handler.h
+A      glabels2/src/bonobo-mdi-child.c
+A      glabels2/src/bonobo-mdi-child.h
+A      glabels2/src/bonobo-mdi.c
+A      glabels2/src/bonobo-mdi.h
+A      glabels2/src/canvas-hacktext.c
+A      glabels2/src/canvas-hacktext.h
+A      glabels2/src/commands.c
+A      glabels2/src/commands.h
 A      glabels2/src/debug.c
 A      glabels2/src/debug.h
 A      glabels2/src/file.c
 A      glabels2/src/file.h
 A      glabels2/src/glabels-batch.c
+A      glabels2/src/glabels-ui.xml
 A      glabels2/src/glabels.c
-A      glabels2/src/hig.h
+A      glabels2/src/glabels.h
+A      glabels2/src/gnome-recent-marshal.list
+A      glabels2/src/gnome-recent-model.c
+A      glabels2/src/gnome-recent-model.h
+A      glabels2/src/gnome-recent-util.c
+A      glabels2/src/gnome-recent-util.h
+A      glabels2/src/gnome-recent-view-bonobo.c
+A      glabels2/src/gnome-recent-view-bonobo.h
+A      glabels2/src/gnome-recent-view.c
+A      glabels2/src/gnome-recent-view.h
 A      glabels2/src/label-barcode.c
 A      glabels2/src/label-barcode.h
 A      glabels2/src/label-box.c
@@ -3028,54 +25134,24 @@ A      glabels2/src/label-text.h
 A      glabels2/src/label.c
 A      glabels2/src/label.h
 A      glabels2/src/marshal.list
-A      glabels2/src/merge-evolution.c
-A      glabels2/src/merge-evolution.h
-A      glabels2/src/merge-init.c
-A      glabels2/src/merge-init.h
-A      glabels2/src/merge-properties-dialog.c
-A      glabels2/src/merge-properties-dialog.h
+A      glabels2/src/mdi-child.c
+A      glabels2/src/mdi-child.h
+A      glabels2/src/mdi.c
+A      glabels2/src/mdi.h
+A      glabels2/src/menus.c
+A      glabels2/src/menus.h
+A      glabels2/src/merge-properties.c
+A      glabels2/src/merge-properties.h
 A      glabels2/src/merge-text.c
 A      glabels2/src/merge-text.h
-A      glabels2/src/merge-vcard.c
-A      glabels2/src/merge-vcard.h
+A      glabels2/src/merge-ui-text.c
+A      glabels2/src/merge-ui-text.h
+A      glabels2/src/merge-ui.c
+A      glabels2/src/merge-ui.h
 A      glabels2/src/merge.c
 A      glabels2/src/merge.h
-A      glabels2/src/mini-preview-pixbuf-cache.c
-A      glabels2/src/mini-preview-pixbuf-cache.h
-A      glabels2/src/mini-preview-pixbuf.c
-A      glabels2/src/mini-preview-pixbuf.h
-A      glabels2/src/mygal/Makefile.am
-A      glabels2/src/mygal/color-group.c
-A      glabels2/src/mygal/color-group.h
-A      glabels2/src/mygal/color-palette.c
-A      glabels2/src/mygal/color-palette.h
-A      glabels2/src/mygal/e-colors.c
-A      glabels2/src/mygal/e-colors.h
-A      glabels2/src/mygal/e-marshal.list
-A      glabels2/src/mygal/e-util.h
-A      glabels2/src/mygal/mygal-combo-box.c
-A      glabels2/src/mygal/mygal-combo-box.h
-A      glabels2/src/mygal/widget-color-combo.c
-A      glabels2/src/mygal/widget-color-combo.h
-A      glabels2/src/new-label-dialog.c
-A      glabels2/src/new-label-dialog.h
-A      glabels2/src/object-editor-bc-page.c
-A      glabels2/src/object-editor-data-page.c
-A      glabels2/src/object-editor-edit-page.c
-A      glabels2/src/object-editor-fill-page.c
-A      glabels2/src/object-editor-image-page.c
-A      glabels2/src/object-editor-line-page.c
-A      glabels2/src/object-editor-lsize-page.c
-A      glabels2/src/object-editor-position-page.c
-A      glabels2/src/object-editor-private.h
-A      glabels2/src/object-editor-shadow-page.c
-A      glabels2/src/object-editor-size-page.c
-A      glabels2/src/object-editor-text-page.c
-A      glabels2/src/object-editor.c
-A      glabels2/src/object-editor.h
-A      glabels2/src/pixbuf-cache.c
-A      glabels2/src/pixbuf-cache.h
 A      glabels2/src/pixmaps/Makefile.am
+A      glabels2/src/pixmaps/Makefile.in
 A      glabels2/src/pixmaps/checkerboard.xpm
 A      glabels2/src/pixmaps/collate.xpm
 A      glabels2/src/pixmaps/cursor_barcode.xbm
@@ -3093,73 +25169,34 @@ A      glabels2/src/pixmaps/cursor_text_mask.xbm
 A      glabels2/src/pixmaps/nocollate.xpm
 A      glabels2/src/prefs-dialog.c
 A      glabels2/src/prefs-dialog.h
-A      glabels2/src/prefs-model.c
-A      glabels2/src/prefs-model.h
 A      glabels2/src/prefs.c
 A      glabels2/src/prefs.h
-A      glabels2/src/print-op.c
-A      glabels2/src/print-op.h
+A      glabels2/src/print-dialog.c
+A      glabels2/src/print-dialog.h
 A      glabels2/src/print.c
 A      glabels2/src/print.h
 A      glabels2/src/recent.c
 A      glabels2/src/recent.h
+A      glabels2/src/splash.c
+A      glabels2/src/splash.h
 A      glabels2/src/stock-pixmaps/Makefile.am
-A      glabels2/src/stock-pixmaps/stock_align_bottom_16.png
-A      glabels2/src/stock-pixmaps/stock_align_hcenter_16.png
-A      glabels2/src/stock-pixmaps/stock_align_left_16.png
-A      glabels2/src/stock-pixmaps/stock_align_right_16.png
-A      glabels2/src/stock-pixmaps/stock_align_top_16.png
-A      glabels2/src/stock-pixmaps/stock_align_vcenter_16.png
-A      glabels2/src/stock-pixmaps/stock_arrow_16.png
+A      glabels2/src/stock-pixmaps/Makefile.in
 A      glabels2/src/stock-pixmaps/stock_arrow_24.png
-A      glabels2/src/stock-pixmaps/stock_barcode_16.png
 A      glabels2/src/stock-pixmaps/stock_barcode_24.png
-A      glabels2/src/stock-pixmaps/stock_box_16.png
 A      glabels2/src/stock-pixmaps/stock_box_24.png
-A      glabels2/src/stock-pixmaps/stock_bucket_fill_16.png
-A      glabels2/src/stock-pixmaps/stock_bucket_fill_24.png
-A      glabels2/src/stock-pixmaps/stock_center_horiz_16.png
-A      glabels2/src/stock-pixmaps/stock_center_vert_16.png
-A      glabels2/src/stock-pixmaps/stock_ellipse_16.png
 A      glabels2/src/stock-pixmaps/stock_ellipse_24.png
-A      glabels2/src/stock-pixmaps/stock_flip_horiz_16.png
-A      glabels2/src/stock-pixmaps/stock_flip_vert_16.png
-A      glabels2/src/stock-pixmaps/stock_hchain_24.png
-A      glabels2/src/stock-pixmaps/stock_hchain_broken_24.png
-A      glabels2/src/stock-pixmaps/stock_image_16.png
 A      glabels2/src/stock-pixmaps/stock_image_24.png
-A      glabels2/src/stock-pixmaps/stock_line_16.png
 A      glabels2/src/stock-pixmaps/stock_line_24.png
-A      glabels2/src/stock-pixmaps/stock_merge_16.png
 A      glabels2/src/stock-pixmaps/stock_merge_24.png
-A      glabels2/src/stock-pixmaps/stock_order_bottom_16.png
-A      glabels2/src/stock-pixmaps/stock_order_top_16.png
-A      glabels2/src/stock-pixmaps/stock_pencil_16.png
-A      glabels2/src/stock-pixmaps/stock_pencil_24.png
-A      glabels2/src/stock-pixmaps/stock_properties_16.png
-A      glabels2/src/stock-pixmaps/stock_properties_24.png
-A      glabels2/src/stock-pixmaps/stock_rotate_left_16.png
-A      glabels2/src/stock-pixmaps/stock_rotate_right_16.png
-A      glabels2/src/stock-pixmaps/stock_text_16.png
 A      glabels2/src/stock-pixmaps/stock_text_24.png
-A      glabels2/src/stock-pixmaps/stock_vchain_24.png
-A      glabels2/src/stock-pixmaps/stock_vchain_broken_24.png
 A      glabels2/src/stock.c
 A      glabels2/src/stock.h
-A      glabels2/src/template-designer.c
-A      glabels2/src/template-designer.h
+A      glabels2/src/template.c
+A      glabels2/src/template.h
 A      glabels2/src/text-node.c
 A      glabels2/src/text-node.h
-A      glabels2/src/ui-commands.c
-A      glabels2/src/ui-commands.h
-A      glabels2/src/ui-property-bar.c
-A      glabels2/src/ui-property-bar.h
-A      glabels2/src/ui-sidebar.c
-A      glabels2/src/ui-sidebar.h
-A      glabels2/src/ui-util.c
-A      glabels2/src/ui-util.h
-A      glabels2/src/ui.c
-A      glabels2/src/ui.h
+A      glabels2/src/tools.c
+A      glabels2/src/tools.h
 A      glabels2/src/util.c
 A      glabels2/src/util.h
 A      glabels2/src/view-barcode.c
@@ -3168,6 +25205,8 @@ A        glabels2/src/view-box.c
 A      glabels2/src/view-box.h
 A      glabels2/src/view-ellipse.c
 A      glabels2/src/view-ellipse.h
+A      glabels2/src/view-highlight.c
+A      glabels2/src/view-highlight.h
 A      glabels2/src/view-image.c
 A      glabels2/src/view-image.h
 A      glabels2/src/view-line.c
@@ -3178,33 +25217,843 @@ A     glabels2/src/view-text.c
 A      glabels2/src/view-text.h
 A      glabels2/src/view.c
 A      glabels2/src/view.h
-A      glabels2/src/warning-handler.c
-A      glabels2/src/warning-handler.h
-A      glabels2/src/wdgt-chain-button.c
-A      glabels2/src/wdgt-chain-button.h
+A      glabels2/src/wdgt-bc-data.c
+A      glabels2/src/wdgt-bc-data.h
+A      glabels2/src/wdgt-bc-props.c
+A      glabels2/src/wdgt-bc-props.h
+A      glabels2/src/wdgt-bc-style.c
+A      glabels2/src/wdgt-bc-style.h
+A      glabels2/src/wdgt-fill.c
+A      glabels2/src/wdgt-fill.h
+A      glabels2/src/wdgt-line.c
+A      glabels2/src/wdgt-line.h
 A      glabels2/src/wdgt-media-select.c
 A      glabels2/src/wdgt-media-select.h
 A      glabels2/src/wdgt-mini-preview.c
 A      glabels2/src/wdgt-mini-preview.h
+A      glabels2/src/wdgt-position.c
+A      glabels2/src/wdgt-position.h
 A      glabels2/src/wdgt-print-copies.c
 A      glabels2/src/wdgt-print-copies.h
 A      glabels2/src/wdgt-print-merge.c
 A      glabels2/src/wdgt-print-merge.h
 A      glabels2/src/wdgt-rotate-label.c
 A      glabels2/src/wdgt-rotate-label.h
-A      glabels2/src/window.c
-A      glabels2/src/window.h
-A      glabels2/src/xml-label-04.c
-A      glabels2/src/xml-label-04.h
+A      glabels2/src/wdgt-size.c
+A      glabels2/src/wdgt-size.h
+A      glabels2/src/wdgt-text-entry.c
+A      glabels2/src/wdgt-text-entry.h
+A      glabels2/src/wdgt-text-props.c
+A      glabels2/src/wdgt-text-props.h
+A      glabels2/src/wdgt-vector.c
+A      glabels2/src/wdgt-vector.h
 A      glabels2/src/xml-label.c
 A      glabels2/src/xml-label.h
+A      glabels2/stamp-h.in
+
+commit 22858b6573961f37d305a8c343e10348562b578c
+Author: Olivier Berger <oberger@april.org>
+Date:  2002-06-29
+
+    Updated french translation, up to date with 0.4.4
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@37
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/po/ChangeLog
+M      glabels1/po/fr.po
+
+commit f5964f89087a3541d6fcfdb506f5ddff3f8d4e73
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-28
 
-commit aa41cfa57d2ea352fee26bbacfcd6ac919f1ee76
+    Fix broken build environment.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@36
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/ABOUT-NLS
+M      glabels1/ChangeLog
+M      glabels1/Makefile.am
+M      glabels1/aclocal.m4
+M      glabels1/config.h.in
+M      glabels1/configure.in
+M      glabels1/intl/Makefile.in
+M      glabels1/macros/Makefile.in
+M      glabels1/po/ChangeLog
+M      glabels1/po/Makefile.in.in
+D      glabels1/po/Makevars
+D      glabels1/po/Rules-quot
+D      glabels1/po/boldquot.sed
+M      glabels1/po/cat-id-tbl.c
+M      glabels1/po/de.gmo
+M      glabels1/po/de.po
+D      glabels1/po/en@boldquot.header
+D      glabels1/po/en@quot.header
+M      glabels1/po/es.gmo
+M      glabels1/po/es.po
+M      glabels1/po/fr.gmo
+M      glabels1/po/fr.po
+M      glabels1/po/glabels.pot
+D      glabels1/po/insert-header.sin
+M      glabels1/po/ja.gmo
+M      glabels1/po/ja.po
+M      glabels1/po/pt_BR.gmo
+M      glabels1/po/pt_BR.po
+D      glabels1/po/quot.sed
+D      glabels1/po/remove-potcdate.sin
+
+commit 628da1b907a5f2e056bf22f25ca66116a87e4919
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    Additional label template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@35
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+M      glabels1/data/predefined-labels.template
+
+commit e76e40d1a99bd29c9b415cf337a2d7ea21f285bb
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    Improved CSV parsing.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@34
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/merge.c
+M      glabels1/src/merge_text.c
+
+commit a83f950c1f19019cf0092cb7b3af5c61b67417f6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    Changed about dialog image.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@33
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/menu.c
+
+commit ea3d9e9fce16b8c8cbdbbced5efe15f96675e099
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    New files
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@32
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels1/po/Makevars
+A      glabels1/po/Rules-quot
+A      glabels1/po/boldquot.sed
+A      glabels1/po/en@boldquot.header
+A      glabels1/po/en@quot.header
+A      glabels1/po/insert-header.sin
+A      glabels1/po/quot.sed
+A      glabels1/po/remove-potcdate.sin
+
+commit 594b9be22fb1e36585db796865b0362383c20ae1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    Translations
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@31
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/po/ChangeLog
+M      glabels1/po/Makefile.in.in
+M      glabels1/po/de.gmo
+M      glabels1/po/de.po
+M      glabels1/po/es.gmo
+M      glabels1/po/es.po
+M      glabels1/po/fr.gmo
+M      glabels1/po/fr.po
+M      glabels1/po/ja.gmo
+M      glabels1/po/ja.po
+M      glabels1/po/pt_BR.gmo
+M      glabels1/po/pt_BR.po
+
+commit 06635a8408e4ba916a1bdb650c6690d58cd9b645
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    Added logo specific to about dialog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@30
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels1/pixmaps/glabels-about-logo.png
+
+commit 60965cc5cf022e99d55479976052837f583888ef
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-26
+
+    File updated w/ gettextize
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@29
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/ChangeLog
+
+commit 6bbae5eef63555bf36c2bcf34df417346e6b64a4
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Updated config.h.in.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@28
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/config.h.in
+
+commit a14d460e21dd854a5911b0e54508de37080153b0
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Updated aclocal.m4.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@27
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/aclocal.m4
+
+commit 52f6a1af385187422b6466c76cc1be50c65f9251
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Updated Makefile.am.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@26
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/Makefile.am
+
+commit 43641f1b064d30a89204ed25b99d4f466a897bcd
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Updated Changelog.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@25
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/ChangeLog
+
+commit c51ab34df7eacbf61c92131adf127fc50bead398
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Updated ABOUT-NLS.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@24
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/ABOUT-NLS
+
+commit b5b3e5c81b4fc4ed519ed2bca6cd8c98cba9c2db
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Set release to 0.4.4
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@23
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/configure.in
+
+commit 365dc4288dee2a5ad40261fc62aa596df656ed9d
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Removing generated files from CM.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@22
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels1/Makefile.in
+D      glabels1/configure
+D      glabels1/glabels.spec
+
+commit 4205e33a8096be62999327a27a709fb90f12ad12
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Removing generated files from CM.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@21
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+D      glabels1/src/Makefile.in
+D      glabels1/src/pixmaps/Makefile.in
+
+commit 979dfe500f5773e1fe925e46135045125075b440
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Replace gnu-barcode-0.96 with 0.98.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@20
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+M      glabels1/Makefile.am
+M      glabels1/configure.in
+M      glabels1/src/Makefile.am
+
+commit 492ca6b93e3360e64288df1efdd1383990a77c78
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Checking in gnu-barcode-0.98
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@19
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+A      glabels1/barcode-0.98/COPYING
+A      glabels1/barcode-0.98/ChangeLog
+A      glabels1/barcode-0.98/INSTALL
+A      glabels1/barcode-0.98/Makefile.in
+A      glabels1/barcode-0.98/README
+A      glabels1/barcode-0.98/TODO
+A      glabels1/barcode-0.98/barcode.h
+A      glabels1/barcode-0.98/barcode.spec
+A      glabels1/barcode-0.98/bookland/bookland.py
+A      glabels1/barcode-0.98/cmdline.c
+A      glabels1/barcode-0.98/cmdline.h
+A      glabels1/barcode-0.98/codabar.c
+A      glabels1/barcode-0.98/code128.c
+A      glabels1/barcode-0.98/code39.c
+A      glabels1/barcode-0.98/code93.c
+A      glabels1/barcode-0.98/compat/getopt.c
+A      glabels1/barcode-0.98/compat/getopt.h
+A      glabels1/barcode-0.98/configure
+A      glabels1/barcode-0.98/configure.in
+A      glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
+A      glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+A      glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+A      glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+A      glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
+A      glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+A      glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
+A      glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+A      glabels1/barcode-0.98/debian/README.debian
+A      glabels1/barcode-0.98/debian/changelog
+A      glabels1/barcode-0.98/debian/control
+A      glabels1/barcode-0.98/debian/copyright
+A      glabels1/barcode-0.98/debian/dirs
+A      glabels1/barcode-0.98/debian/info
+A      glabels1/barcode-0.98/debian/rules
+A      glabels1/barcode-0.98/doc/Makefile.in
+A      glabels1/barcode-0.98/doc/README
+A      glabels1/barcode-0.98/doc/barcode.info
+A      glabels1/barcode-0.98/doc/barcode.pdf
+A      glabels1/barcode-0.98/doc/barcode.ps
+A      glabels1/barcode-0.98/doc/barcodedoc.txt
+A      glabels1/barcode-0.98/doc/doc.barcode
+A      glabels1/barcode-0.98/doc/infofilter
+A      glabels1/barcode-0.98/doc/manpager
+A      glabels1/barcode-0.98/doc/mktxt
+A      glabels1/barcode-0.98/doc/texi2html
+A      glabels1/barcode-0.98/ean.c
+A      glabels1/barcode-0.98/i25.c
+A      glabels1/barcode-0.98/install-sh
+A      glabels1/barcode-0.98/library.c
+A      glabels1/barcode-0.98/main.c
+A      glabels1/barcode-0.98/msi.c
+A      glabels1/barcode-0.98/pcl.c
+A      glabels1/barcode-0.98/plessey.c
+A      glabels1/barcode-0.98/ps.c
+A      glabels1/barcode-0.98/sample.c
+
+commit 6592672d77f4e9a0ddab08ef198b56718dc24202
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Added acknowledgements for additional label templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@18
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+
+commit 44132388529f64112507a9f2f94ae210b0d738b1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-06-18
+
+    Added additional templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@17
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/data/predefined-labels.template
+
+commit 387dfd746a801119e2956e413118cbb050da0e75
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-05-01
+
+    Additional template.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@16
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/data/predefined-labels.template
+
+commit 6e06d81c9164744d348b2311471c8623df077839
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-05-01
+
+    Additional credits for templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@15
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+
+commit ca24de55a2ed8cf5287e3531692edce61f0f1d76
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Added spanish (es) support.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@14
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/po/cat-id-tbl.c
+A      glabels1/po/es.gmo
+C066   glabels1/po/glabels.pot glabels1/po/es.po
+M      glabels1/po/glabels.pot
+
+commit 22a00a789cdea2fce310e66ac30f3ef210aa94e0
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Updated japanese strings.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@13
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/po/ja.gmo
+M      glabels1/po/ja.po
+
+commit 46d285dea66301d12d3c11a4271cd8f1a3305e6b
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Added additional label templates.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@12
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/data/predefined-labels.template
+
+commit db1ba5a430a9d58faf13e70a807a5d082ce2e3a6
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Added support for spanish (es).
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@11
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/configure.in
+
+commit 92dd882d7b64ff3a86500f66ac85456e45e8c83a
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Added acknowledgements.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@10
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/AUTHORS
+
+commit 36bc656ed2f4592f58437035c0ca88444f8faa07
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Removed the clip_to_outline code -- this seemed to cause an outline
+    to be printed for some printers.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@9
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/print.c
+
+commit 80c7efe71c394abaab547eee7172ec4c24f2067f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-29
+
+    Fixed layout of labels so that they are layed out in the proper
+    coordinate system:
+    The canvas origin is at the upper left, while the origin on paper
+    is at the lower left.
+    This was not apparent until a non-symetric (vertical) layout was used.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@8
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/mini_preview.c
+
+commit e054900210bd868ed5241f37a6c7220ce13f577f
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-27
+
+    Don't assume all events are button events!
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@7
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/mini_preview.c
+
+commit 9eb6a8a37fd94d5aba4831453a4c2c915dd86cb1
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-04-27
+
+    Use motion union member for MOTION events.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@6
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/src/display.c
+M      glabels1/src/item_box.c
+M      glabels1/src/item_ellipse.c
+M      glabels1/src/item_image.c
+M      glabels1/src/item_line.c
+
+commit e1e85ce13c158a14303c2a38aa1902a42df6d4d8
+Author: Jim Evins <evins@snaught.com>
+Date:  2002-02-28
+
+    Added glabels-batch to glabels.spec.in.
+    Added entries to TODO.
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@5
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
+
+M      glabels1/TODO
+M      glabels1/glabels.spec.in
+
+commit 1852a103b62f3106bd032dc6e7a55b6ebec5449c
 Author: Jim Evins <evins@snaught.com>
-Date:  2007-12-25
+Date:  2002-02-24
+
+    Initial revision
+
+
+    git-svn-id:
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@2
+    f5e0f49d-192f-0410-a22d-a8d8700d0965
 
-    Creating glabels-2.2 branch.
+A      glabels1/ABOUT-NLS
+A      glabels1/AUTHORS
+A      glabels1/COPYING
+A      glabels1/ChangeLog
+A      glabels1/INSTALL
+A      glabels1/Makefile.am
+A      glabels1/Makefile.in
+A      glabels1/NEWS
+A      glabels1/README
+A      glabels1/TODO
+A      glabels1/acconfig.h
+A      glabels1/aclocal.m4
+A      glabels1/autogen.sh
+A      glabels1/config.h.in
+A      glabels1/configure
+A      glabels1/configure.in
+A      glabels1/data/predefined-labels.template
+A      glabels1/doc/C/Makefile.am
+A      glabels1/doc/C/Makefile.in
+A      glabels1/doc/C/glabels.sgml
+A      glabels1/doc/C/glabels/index.html
+A      glabels1/doc/C/glabels/ln7.html
+A      glabels1/doc/C/topic.dat
+A      glabels1/doc/Makefile.am
+A      glabels1/doc/Makefile.in
+A      glabels1/glabels.desktop
+A      glabels1/glabels.spec
+A      glabels1/glabels.spec.in
+A      glabels1/install-sh
+A      glabels1/intl/ChangeLog
+A      glabels1/intl/Makefile.in
+A      glabels1/intl/VERSION
+A      glabels1/intl/bindtextdom.c
+A      glabels1/intl/cat-compat.c
+A      glabels1/intl/dcgettext.c
+A      glabels1/intl/dgettext.c
+A      glabels1/intl/explodename.c
+A      glabels1/intl/finddomain.c
+A      glabels1/intl/gettext.c
+A      glabels1/intl/gettext.h
+A      glabels1/intl/gettextP.h
+A      glabels1/intl/hash-string.h
+A      glabels1/intl/intl-compat.c
+A      glabels1/intl/l10nflist.c
+A      glabels1/intl/libgettext.h
+A      glabels1/intl/linux-msg.sed
+A      glabels1/intl/loadinfo.h
+A      glabels1/intl/loadmsgcat.c
+A      glabels1/intl/localealias.c
+A      glabels1/intl/po2tbl.sed.in
+A      glabels1/intl/textdomain.c
+A      glabels1/intl/xopen-msg.sed
+A      glabels1/macros/Makefile.am
+A      glabels1/macros/Makefile.in
+A      glabels1/macros/aclocal-include.m4
+A      glabels1/macros/autogen.sh
+A      glabels1/macros/compiler-flags.m4
+A      glabels1/macros/curses.m4
+A      glabels1/macros/gnome-bonobo-check.m4
+A      glabels1/macros/gnome-common.m4
+A      glabels1/macros/gnome-fileutils.m4
+A      glabels1/macros/gnome-gettext.m4
+A      glabels1/macros/gnome-ghttp-check.m4
+A      glabels1/macros/gnome-gnorba-check.m4
+A      glabels1/macros/gnome-guile-checks.m4
+A      glabels1/macros/gnome-libgtop-check.m4
+A      glabels1/macros/gnome-objc-checks.m4
+A      glabels1/macros/gnome-orbit-check.m4
+A      glabels1/macros/gnome-print-check.m4
+A      glabels1/macros/gnome-pthread-check.m4
+A      glabels1/macros/gnome-support.m4
+A      glabels1/macros/gnome-undelfs.m4
+A      glabels1/macros/gnome-vfs.m4
+A      glabels1/macros/gnome-x-checks.m4
+A      glabels1/macros/gnome-xml-check.m4
+A      glabels1/macros/gnome.m4
+A      glabels1/macros/linger.m4
+A      glabels1/macros/need-declaration.m4
+A      glabels1/missing
+A      glabels1/mkinstalldirs
+A      glabels1/pixmaps/glabels-icon.png
+A      glabels1/pixmaps/glabels-logo.png
+A      glabels1/po/ChangeLog
+A      glabels1/po/Makefile.in.in
+A      glabels1/po/POTFILES.in
+A      glabels1/po/cat-id-tbl.c
+A      glabels1/po/de.gmo
+A      glabels1/po/de.po
+A      glabels1/po/fr.gmo
+A      glabels1/po/fr.po
+A      glabels1/po/glabels.pot
+A      glabels1/po/ja.gmo
+A      glabels1/po/ja.po
+A      glabels1/po/pt_BR.gmo
+A      glabels1/po/pt_BR.po
+A      glabels1/po/stamp-cat-id
+A      glabels1/src/Makefile.am
+A      glabels1/src/Makefile.in
+A      glabels1/src/bc.c
+A      glabels1/src/bc.h
+A      glabels1/src/bc_gnubarcode.c
+A      glabels1/src/bc_gnubarcode.h
+A      glabels1/src/bc_postnet.c
+A      glabels1/src/bc_postnet.h
+A      glabels1/src/debug.h
+A      glabels1/src/display.c
+A      glabels1/src/display.h
+A      glabels1/src/edit.c
+A      glabels1/src/edit.h
+A      glabels1/src/file.c
+A      glabels1/src/file.h
+A      glabels1/src/glabels.c
+A      glabels1/src/glabels_batch.c
+A      glabels1/src/gnome-canvas-hacktext.h
+A      glabels1/src/hack.c
+A      glabels1/src/hack.h
+A      glabels1/src/highlight.c
+A      glabels1/src/highlight.h
+A      glabels1/src/item.c
+A      glabels1/src/item.h
+A      glabels1/src/item_barcode.c
+A      glabels1/src/item_barcode.h
+A      glabels1/src/item_box.c
+A      glabels1/src/item_box.h
+A      glabels1/src/item_ellipse.c
+A      glabels1/src/item_ellipse.h
+A      glabels1/src/item_image.c
+A      glabels1/src/item_image.h
+A      glabels1/src/item_line.c
+A      glabels1/src/item_line.h
+A      glabels1/src/item_text.c
+A      glabels1/src/item_text.h
+A      glabels1/src/label.c
+A      glabels1/src/label.h
+A      glabels1/src/mdi.c
+A      glabels1/src/mdi.h
+A      glabels1/src/media_select.c
+A      glabels1/src/media_select.h
+A      glabels1/src/menu.c
+A      glabels1/src/menu.h
+A      glabels1/src/merge.c
+A      glabels1/src/merge.h
+A      glabels1/src/merge_properties.c
+A      glabels1/src/merge_properties.h
+A      glabels1/src/merge_text.c
+A      glabels1/src/merge_text.h
+A      glabels1/src/merge_ui.c
+A      glabels1/src/merge_ui.h
+A      glabels1/src/merge_ui_text.c
+A      glabels1/src/merge_ui_text.h
+A      glabels1/src/mini_preview.c
+A      glabels1/src/mini_preview.h
+A      glabels1/src/pixmaps/Makefile.am
+A      glabels1/src/pixmaps/Makefile.in
+A      glabels1/src/pixmaps/arrow.xpm
+A      glabels1/src/pixmaps/barcode.xpm
+A      glabels1/src/pixmaps/box.xpm
+A      glabels1/src/pixmaps/checkerboard.xpm
+A      glabels1/src/pixmaps/collate.xpm
+A      glabels1/src/pixmaps/cursor_barcode.xbm
+A      glabels1/src/pixmaps/cursor_barcode_mask.xbm
+A      glabels1/src/pixmaps/cursor_box.xbm
+A      glabels1/src/pixmaps/cursor_box_mask.xbm
+A      glabels1/src/pixmaps/cursor_ellipse.xbm
+A      glabels1/src/pixmaps/cursor_ellipse_mask.xbm
+A      glabels1/src/pixmaps/cursor_image.xbm
+A      glabels1/src/pixmaps/cursor_image_mask.xbm
+A      glabels1/src/pixmaps/cursor_line.xbm
+A      glabels1/src/pixmaps/cursor_line_mask.xbm
+A      glabels1/src/pixmaps/cursor_text.xbm
+A      glabels1/src/pixmaps/cursor_text_mask.xbm
+A      glabels1/src/pixmaps/cursor_zoomin.xbm
+A      glabels1/src/pixmaps/cursor_zoomin_mask.xbm
+A      glabels1/src/pixmaps/cursor_zoomout.xbm
+A      glabels1/src/pixmaps/cursor_zoomout_mask.xbm
+A      glabels1/src/pixmaps/ellipse.xpm
+A      glabels1/src/pixmaps/image.xpm
+A      glabels1/src/pixmaps/line.xpm
+A      glabels1/src/pixmaps/merge.xpm
+A      glabels1/src/pixmaps/nocollate.xpm
+A      glabels1/src/pixmaps/text.xpm
+A      glabels1/src/pixmaps/zoom1to1.xpm
+A      glabels1/src/pixmaps/zoomin.xpm
+A      glabels1/src/pixmaps/zoomout.xpm
+A      glabels1/src/prefs.c
+A      glabels1/src/prefs.h
+A      glabels1/src/print.c
+A      glabels1/src/print.h
+A      glabels1/src/print_copies.c
+A      glabels1/src/print_copies.h
+A      glabels1/src/print_dialog.c
+A      glabels1/src/print_dialog.h
+A      glabels1/src/print_merge.c
+A      glabels1/src/print_merge.h
+A      glabels1/src/prop_bc.c
+A      glabels1/src/prop_bc.h
+A      glabels1/src/prop_bc_data.c
+A      glabels1/src/prop_bc_data.h
+A      glabels1/src/prop_bc_style.c
+A      glabels1/src/prop_bc_style.h
+A      glabels1/src/prop_fill.c
+A      glabels1/src/prop_fill.h
+A      glabels1/src/prop_line.c
+A      glabels1/src/prop_line.h
+A      glabels1/src/prop_position.c
+A      glabels1/src/prop_position.h
+A      glabels1/src/prop_size.c
+A      glabels1/src/prop_size.h
+A      glabels1/src/prop_text.c
+A      glabels1/src/prop_text.h
+A      glabels1/src/prop_text_entry.c
+A      glabels1/src/prop_text_entry.h
+A      glabels1/src/prop_vector.c
+A      glabels1/src/prop_vector.h
+A      glabels1/src/propertybox.c
+A      glabels1/src/propertybox.h
+A      glabels1/src/rotate_select.c
+A      glabels1/src/rotate_select.h
+A      glabels1/src/splash.c
+A      glabels1/src/splash.h
+A      glabels1/src/stock.c
+A      glabels1/src/stock.h
+A      glabels1/src/template.c
+A      glabels1/src/template.h
+A      glabels1/src/text_node.c
+A      glabels1/src/text_node.h
+A      glabels1/src/tools.c
+A      glabels1/src/tools.h
+A      glabels1/src/util.c
+A      glabels1/src/util.h
+A      glabels1/stamp-h.in
+
+commit f8b425009ad387d725524c28b79cafdc940a9b8b
+Author: (no author) <(no author)@f5e0f49d-192f-0410-a22d-a8d8700d0965>
+Date:  2002-02-24
+
+    New repository initialized by cvs2svn.
 
     git-svn-id:
-    https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@712
+    https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@1
     f5e0f49d-192f-0410-a22d-a8d8700d0965