head	1.1;
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.1
date	2006.07.28.17.08.40;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	uyiBqWb1HF9JlEGr;

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

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


desc
@@


1.1
log
@upgrading package: elm 2.4.122l -> 2.4.123a
@
text
@Index: hdrs/misclib.h
--- hdrs/misclib.h.orig	2006-07-05 19:21:50 +0200
+++ hdrs/misclib.h	2006-07-28 19:05:26 +0200
@@@@ -7,6 +7,21 @@@@
  *      or  Kari Hurtta <elm@@elmme-mailer.org>
  *****************************************************************************/
 
+struct mime_types_item {
+    char                * extension;
+    struct media_type   * type;
+
+    char                * params;
+    charset_t           params_cs;
+
+    /* magic */
+    int                 offset;
+    int                 length;
+    unsigned char     * bytes;
+
+};
+
+
 /* lib/misc/init.c */
 
 extern struct terminal_map_item * system_terminal_map;
Index: lib/misc/mime_types.c
--- lib/misc/mime_types.c.orig	2006-07-05 19:21:50 +0200
+++ lib/misc/mime_types.c	2006-07-28 19:05:26 +0200
@@@@ -25,20 +25,6 @@@@
     return (unsigned char *)str;
 }
 
-struct mime_types_item {
-    char                * extension;
-    struct media_type   * type;
-
-    char                * params;
-    charset_t           params_cs;
-
-    /* magic */
-    int                 offset;
-    int                 length;
-    unsigned char     * bytes;
-
-};
-
 /* -------------------------------------------------------------------- */
 
 #define U_(x) (unsigned char *)(x)
@


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


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 49
Index: hdrs/misclib.h
--- hdrs/misclib.h.orig	2006-07-05 19:21:50 +0200
+++ hdrs/misclib.h	2006-07-28 19:05:26 +0200
@@@@ -7,6 +7,21 @@@@
  *      or  Kari Hurtta <elm@@elmme-mailer.org>
  *****************************************************************************/
 
+struct mime_types_item {
+    char                * extension;
+    struct media_type   * type;
+
+    char                * params;
+    charset_t           params_cs;
+
+    /* magic */
+    int                 offset;
+    int                 length;
+    unsigned char     * bytes;
+
+};
+
+
 /* lib/misc/init.c */
 
 extern struct terminal_map_item * system_terminal_map;
Index: lib/misc/mime_types.c
--- lib/misc/mime_types.c.orig	2006-07-05 19:21:50 +0200
+++ lib/misc/mime_types.c	2006-07-28 19:05:26 +0200
@@@@ -25,20 +25,6 @@@@
     return (unsigned char *)str;
 }
 
-struct mime_types_item {
-    char                * extension;
-    struct media_type   * type;
-
-    char                * params;
-    charset_t           params_cs;
-
-    /* magic */
-    int                 offset;
-    int                 length;
-    unsigned char     * bytes;
-
-};
-
 /* -------------------------------------------------------------------- */
 
 #define U_(x) (unsigned char *)(x)
@