head     1.1;
branch   1.1.1;
access   ;
symbols  init:1.1.1.1 vendor:1.1.1;
locks    ; strict;
comment  @# @;


1.1
date     2006.01.16.11.21.58;  author sctp;  state Exp;
branches 1.1.1.1;
next     ;

1.1.1.1
date     2006.01.16.11.21.58;  author sctp;  state Exp;
branches ;
next     ;


desc
@@



1.1
log
@Initial revision
@
text
@conflict boxes-fst.dat
conflict rijndael-alg-fst.c
conflict rijndael-alg-fst.h
conflict rijndael-api-fst.c
conflict rijndael-api-fst.h
conflict rijndael.h
conflict rijndael_local.h
@


1.1.1.1
log
@sctp test cvs
@
text
@@
