Changeset 1866

Show
Ignore:
Timestamp:
26.01.2001 14:09:53 (19 years ago)
Author:
jrm21
Message:

fixed up conflict with new corba branch added to cvs head.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/yaz/include/yaz/proto.h

    r1862 r1866  
    44 * Sebastian Hammer, Adam Dickmeiss 
    55 * 
    6  * $Log$ 
    7  * Revision 1.5  2001/01/25 18:57:38  cs025 
    8  * Minor touches to configuration of txt2db; removed use of MICO linker. 
    9  * 
    10  * Revision 1.1  2000/08/03 03:11:01  johnmcp 
    11  * Added the YAZ toolkit source to the packages directory (for z39.50 stuff) 
    12  * 
    13  * Revision 1.3  2000/02/28 11:20:06  adam 
    14  * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. 
    15  * 
    16  * Revision 1.2  1999/12/16 23:36:19  adam 
    17  * Implemented ILL protocol. Minor updates ASN.1 compiler. 
    18  * 
    19  * Revision 1.1  1999/11/30 13:47:11  adam 
    20  * Improved installation. Moved header files to include/yaz. 
    21  * 
    22  * Revision 1.2  1999/06/09 10:52:11  adam 
    23  * Added YAZ_EXPORT. 
    24  * 
    25  * Revision 1.1  1999/06/08 13:11:55  adam 
    26  * Fixed problem with proto.h. 
    27  * 
    28  * Revision 1.2  1999/04/20 10:37:04  adam 
    29  * Updated for ODR - added name parameter. 
    30  * 
    31  * Revision 1.1  1998/03/31 16:04:05  adam 
    32  * First version of proto.h which is almost compatible with the old one. 
    33  * 
     6 *  cvs log info removed. - jrm21 
    347 */ 
    358#ifndef Z_PROTO_H