CVS commit: src/sys/external/bsd/sljit/dist/sljit_src

["Alexander Nasonov" <alnsn%netbsd.org@localhost>]

Module Name:    src
Committed By:   alnsn
Date:           Sun Oct 28 09:38:59 UTC 2012

Modified Files:
        src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h
            sljitConfigInternal.h sljitNativeX86_common.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.