Index: user/ngie/more-tests/etc/rc.d/tests =================================================================== --- user/ngie/more-tests/etc/rc.d/tests (revision 282059) +++ user/ngie/more-tests/etc/rc.d/tests (revision 282060) Property changes on: user/ngie/more-tests/etc/rc.d/tests ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,6 ## Merged /projects/clang350-import/etc/rc.d/tests:r274961-276476 Merged /projects/clang360-import/etc/rc.d/tests:r277327-280030 Merged /projects/clang-sparc64/etc/rc.d/tests:r262258-262612 Merged /head/etc/rc.d/tests:r281414-281924 Merged /projects/building-blocks/etc/rc.d/tests:r275309,275311 Merged /user/ed/newcons/etc/rc.d/tests:r219886-259016 Index: user/ngie/more-tests/etc =================================================================== --- user/ngie/more-tests/etc (revision 282059) +++ user/ngie/more-tests/etc (revision 282060) Property changes on: user/ngie/more-tests/etc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc:r282058-282059 Index: user/ngie/more-tests/lib/libc =================================================================== --- user/ngie/more-tests/lib/libc (revision 282059) +++ user/ngie/more-tests/lib/libc (revision 282060) Property changes on: user/ngie/more-tests/lib/libc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc:r282055-282059 Index: user/ngie/more-tests =================================================================== --- user/ngie/more-tests (revision 282059) +++ user/ngie/more-tests (revision 282060) Property changes on: user/ngie/more-tests ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r282058-282059