git.sur5r.net Git - glabels/commit

]> git.sur5r.net Git - glabels/commit

New document merge API.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@198 f5e0f49d-192f-0410-a22d-a8d8700d0965

30 files changed:

glabels2/po/POTFILES.in		diff \| blob \| history
glabels2/src/Makefile.am		diff \| blob \| history
glabels2/src/glabels-batch.c		diff \| blob \| history
glabels2/src/glabels.c		diff \| blob \| history
glabels2/src/label.c		diff \| blob \| history
glabels2/src/merge-init.c	[new file with mode: 0644]	blob
glabels2/src/merge-init.h	[new file with mode: 0644]	blob
glabels2/src/merge-properties-dialog.c	[new file with mode: 0644]	blob
glabels2/src/merge-properties-dialog.h	[new file with mode: 0644]	blob
glabels2/src/merge-properties.c	[deleted file]	blob \| history
glabels2/src/merge-properties.h	[deleted file]	blob \| history
glabels2/src/merge-text.c		diff \| blob \| history
glabels2/src/merge-text.h		diff \| blob \| history
glabels2/src/merge-ui-text.c	[deleted file]	blob \| history
glabels2/src/merge-ui-text.h	[deleted file]	blob \| history
glabels2/src/merge-ui.c	[deleted file]	blob \| history
glabels2/src/merge-ui.h	[deleted file]	blob \| history
glabels2/src/merge.c		diff \| blob \| history
glabels2/src/merge.h		diff \| blob \| history
glabels2/src/print-dialog.c		diff \| blob \| history
glabels2/src/print.c		diff \| blob \| history
glabels2/src/tools.c		diff \| blob \| history
glabels2/src/view-barcode.c		diff \| blob \| history
glabels2/src/view-text.c		diff \| blob \| history
glabels2/src/wdgt-bc-data.c		diff \| blob \| history
glabels2/src/wdgt-bc-data.h		diff \| blob \| history
glabels2/src/wdgt-text-entry.c		diff \| blob \| history
glabels2/src/wdgt-text-entry.h		diff \| blob \| history
glabels2/src/xml-label-04.c		diff \| blob \| history
glabels2/src/xml-label.c		diff \| blob \| history

gLabels Debian packaging