head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2007.03.29.18.09.42;	author rse;	state dead;
branches;
next	1.1;
commitid	dhE84qMupI4pQ0cs;

1.1
date	2006.01.02.21.04.54;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	GaUqjrZSBLhij4gr;

1.1.2.1
date	2006.01.02.21.04.54;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.49.28;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrading package: dia 0.94 -> 0.96.1
@
text
@Index: objects/custom/shape_info.h
--- objects/custom/shape_info.h.orig	2004-08-16 09:56:15 +0200
+++ objects/custom/shape_info.h	2006-01-02 21:50:52 +0100
@@@@ -166,7 +166,7 @@@@
 
 void shape_info_realise(ShapeInfo* info);
 void shape_info_print(ShapeInfo *info);
-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
+static void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
 
 /*MC 11/03 handy g_new0 variant for struct with variable size */
 #define g_new0_ext(struct_type, ext_size)		\
@


1.1
log
@fix building under GCC 4 world order
@
text
@@


1.1.2.1
log
@file dia.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:28 +0000
@
text
@d1 12
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 12
Index: objects/custom/shape_info.h
--- objects/custom/shape_info.h.orig	2004-08-16 09:56:15 +0200
+++ objects/custom/shape_info.h	2006-01-02 21:50:52 +0100
@@@@ -166,7 +166,7 @@@@
 
 void shape_info_realise(ShapeInfo* info);
 void shape_info_print(ShapeInfo *info);
-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
+static void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
 
 /*MC 11/03 handy g_new0 variant for struct with variable size */
 #define g_new0_ext(struct_type, ext_size)		\
@