Module Name: src Committed By: alnsn Date: Tue Jun 17 16:48:24 UTC 2014
Modified Files: src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h sljitConfigInternal.h sljitExecAllocator.c sljitLir.c sljitNativePPC_common.c sljitNativeX86_32.c sljitNativeX86_common.c sljitUtils.c src/sys/external/bsd/sljit/dist/test_src: sljitMain.c sljitTest.c Removed Files: src/sys/external/bsd/sljit/dist/sljit_src: sljitNativeARM_Thumb2.c sljitNativeARM_v5.c Log Message: Resolve conflicts. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h cvs rdiff -u -r1.6 -r1.7 \ 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/sljitExecAllocator.c \ src/sys/external/bsd/sljit/dist/sljit_src/sljitLir.c \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_32.c cvs rdiff -u -r1.1.1.3 -r0 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_Thumb2.c \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_v5.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/sljit/dist/test_src/sljitMain.c \ src/sys/external/bsd/sljit/dist/test_src/sljitTest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.