Index: stable/10/release/amd64/amd64.conf =================================================================== --- stable/10/release/amd64/amd64.conf (nonexistent) +++ stable/10/release/amd64/amd64.conf (revision 326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build amd64/amd64. + +TARGET="amd64" +TARGET_ARCH="amd64" +KERNEL="GENERIC" Property changes on: stable/10/release/amd64/amd64.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/release/arm/BEAGLEBONE.conf =================================================================== --- stable/10/release/arm/BEAGLEBONE.conf (revision 326015) +++ stable/10/release/arm/BEAGLEBONE.conf (revision 326016) @@ -1,43 +1,43 @@ # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-beaglebone" -KERNEL="BEAGLEBONE" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="BEAGLEBONE" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \ ${UFSMOUNT}/boot/dtb/am335x-bone.dtb chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone-black.dtb \ ${UFSMOUNT}/boot/dtb/am335x-boneblack.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/CUBOX-HUMMINGBOARD.conf =================================================================== --- stable/10/release/arm/CUBOX-HUMMINGBOARD.conf (revision 326015) +++ stable/10/release/arm/CUBOX-HUMMINGBOARD.conf (revision 326016) @@ -1,42 +1,42 @@ #!/bin/sh # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" -KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="495M" -PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL="IMX6" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" export BOARDNAME="CUBOX-HUMMINGBOARD" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard" UBOOT_FILES="u-boot.imx" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ of=/dev/${mddev} bs=512 seek=2 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/GUMSTIX.conf =================================================================== --- stable/10/release/arm/GUMSTIX.conf (revision 326015) +++ stable/10/release/arm/GUMSTIX.conf (revision 326016) @@ -1,40 +1,40 @@ #!/bin/sh # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="arm" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-duovero" -KERNEL="GUMSTIX" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="GUMSTIX" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/PANDABOARD.conf =================================================================== --- stable/10/release/arm/PANDABOARD.conf (revision 326015) +++ stable/10/release/arm/PANDABOARD.conf (revision 326016) @@ -1,39 +1,39 @@ # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pandaboard" -KERNEL="PANDABOARD" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="PANDABOARD" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/RPI-B.conf =================================================================== --- stable/10/release/arm/RPI-B.conf (revision 326015) +++ stable/10/release/arm/RPI-B.conf (revision 326016) @@ -1,45 +1,45 @@ # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi" -KERNEL="RPI-B" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="17m" FAT_TYPE="16" +IMAGE_SIZE="480M" +KERNEL="RPI-B" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ start.elf start_cd.elf u-boot.img" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} for _UF in ${UBOOT_FILES}; do chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \ ${FATMOUNT}/rpi.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/RPI2.conf =================================================================== --- stable/10/release/arm/RPI2.conf (revision 326015) +++ stable/10/release/arm/RPI2.conf (revision 326016) @@ -1,46 +1,46 @@ #!/bin/sh # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi2" -KERNEL="RPI2" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="50m" FAT_TYPE="16" +IMAGE_SIZE="480M" +KERNEL="RPI2" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2" UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} for _UF in ${UBOOT_FILES}; do chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ ${FATMOUNT}/${_UF} done chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \ ${FATMOUNT}/rpi2.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/arm/WANDBOARD.conf =================================================================== --- stable/10/release/arm/WANDBOARD.conf (revision 326015) +++ stable/10/release/arm/WANDBOARD.conf (revision 326016) @@ -1,46 +1,46 @@ #!/bin/sh # # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-wandboard" -KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="495M" -PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL="IMX6" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" export BOARDNAME="WANDBOARD" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard" UBOOT_FILES="u-boot.imx" FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ of=/dev/${mddev} bs=512 seek=2 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6dl-wandboard.dtb \ ${UFSMOUNT}/boot/dtb/imx6dl-wandboard-revb1.dtb chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6q-wandboard.dtb \ ${UFSMOUNT}/boot/dtb/imx6q-wandboard-revb1.dtb chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot sync umount_loop ${CHROOTDIR}/${FATMOUNT} umount_loop ${CHROOTDIR}/${UFSMOUNT} chroot ${CHROOTDIR} rmdir ${FATMOUNT} chroot ${CHROOTDIR} rmdir ${UFSMOUNT} return 0 } Index: stable/10/release/i386/i386.conf =================================================================== --- stable/10/release/i386/i386.conf (nonexistent) +++ stable/10/release/i386/i386.conf (revision 326016) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build i386/i386. +# Note: CHROOT_MAKEENV assumes the build host is amd64. + +TARGET="i386" +TARGET_ARCH="i386" +KERNEL="GENERIC" +CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" Property changes on: stable/10/release/i386/i386.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/release/ia64/ia64.conf =================================================================== --- stable/10/release/ia64/ia64.conf (nonexistent) +++ stable/10/release/ia64/ia64.conf (revision 326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build ia64/ia64. + +TARGET="ia64" +TARGET_ARCH="ia64" +KERNEL="GENERIC" Property changes on: stable/10/release/ia64/ia64.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/release/powerpc/powerpc.conf =================================================================== --- stable/10/release/powerpc/powerpc.conf (nonexistent) +++ stable/10/release/powerpc/powerpc.conf (revision 326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build powerpc/powerpc. + +TARGET="powerpc" +TARGET_ARCH="powerpc" +KERNEL="GENERIC" Property changes on: stable/10/release/powerpc/powerpc.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/release/powerpc/powerpc64.conf =================================================================== --- stable/10/release/powerpc/powerpc64.conf (nonexistent) +++ stable/10/release/powerpc/powerpc64.conf (revision 326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build powerpc/powerpc64. + +TARGET="powerpc" +TARGET_ARCH="powerpc64" +KERNEL="GENERIC64" Property changes on: stable/10/release/powerpc/powerpc64.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/release/sparc64/sparc64.conf =================================================================== --- stable/10/release/sparc64/sparc64.conf (nonexistent) +++ stable/10/release/sparc64/sparc64.conf (revision 326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build sparc64/sparc64. + +TARGET="sparc64" +TARGET_ARCH="sparc64" +KERNEL="GENERIC" Property changes on: stable/10/release/sparc64/sparc64.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10 =================================================================== --- stable/10 (revision 326015) +++ stable/10 (revision 326016) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r325950,325953