Author: pulkomandy Date: 2011-05-30 23:14:11 +0200 (Mon, 30 May 2011) New Revision: 41836 Changeset: https://dev.haiku-os.org/changeset/41836 Added: haiku/branches/releases/r1alpha3/data/catalogs/apps/mandelbrot/be.catkeys haiku/branches/releases/r1alpha3/data/catalogs/apps/musiccollection/be.catkeys Modified: haiku/branches/releases/r1alpha3/ haiku/branches/releases/r1alpha3/build/jam/ haiku/branches/releases/r1alpha3/build/jam/HaikuCD haiku/branches/releases/r1alpha3/build/jam/HaikuImage haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures haiku/branches/releases/r1alpha3/build/jam/OptionalLibPackages haiku/branches/releases/r1alpha3/build/jam/OptionalPackages haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles haiku/branches/releases/r1alpha3/build/jam/UserBuildConfig.ReadMe haiku/branches/releases/r1alpha3/build/scripts/build_haiku_image haiku/branches/releases/r1alpha3/data/catalogs/apps/aboutsystem/be.catkeys haiku/branches/releases/r1alpha3/data/catalogs/apps/deskbar/be.catkeys haiku/branches/releases/r1alpha3/data/catalogs/apps/glteapot/be.catkeys haiku/branches/releases/r1alpha3/headers/libs/freetype2/ haiku/branches/releases/r1alpha3/headers/libs/png/png.h haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/ haiku/branches/releases/r1alpha3/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg/ haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/ haiku/branches/releases/r1alpha3/src/kits/tracker/StatusWindow.cpp haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h haiku/branches/releases/r1alpha3/src/libs/freetype2/ haiku/branches/releases/r1alpha3/src/libs/png/ haiku/branches/releases/r1alpha3/src/libs/tiff/ Log: Merge 41799-41828. Property changes on: haiku/branches/releases/r1alpha3 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 + /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 Property changes on: haiku/branches/releases/r1alpha3/build/jam ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/build/jam:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568 /haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 + /haiku/branches/developer/bonefish/signals/build/jam:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568 /haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 Modified: haiku/branches/releases/r1alpha3/build/jam/HaikuCD =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/HaikuCD 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/HaikuCD 2011-05-30 21:14:11 UTC (rev 41836) @@ -28,6 +28,8 @@ AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; +AddVariableToScript $(script) : stripOptionalPackageDebugSymbols + : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ; AddTargetVariableToScript $(script) : <build>addattr ; AddTargetVariableToScript $(script) : <build>copyattr ; AddTargetVariableToScript $(script) : <build>rc ; Modified: haiku/branches/releases/r1alpha3/build/jam/HaikuImage =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/HaikuImage 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/HaikuImage 2011-05-30 21:14:11 UTC (rev 41836) @@ -153,7 +153,7 @@ PS\ Compatible Preview ; -SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR +SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR # Parallel\ Port Print\ To\ File Serial\ Port USB\ Port ; @@ -783,6 +783,8 @@ : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ; AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ; +AddVariableToScript $(script) : stripOptionalPackageDebugSymbols + : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ; AddTargetVariableToScript $(script) : <build>addattr ; AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ; AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ; Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures 2011-05-30 21:14:11 UTC (rev 41836) @@ -55,8 +55,8 @@ # ICU # Note ICU isn't actually optional, but is still an external package -HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-x86-gcc2-2010-07-26.zip ; -HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-x86-gcc4-2010-07-26.zip ; +HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-r1a3-x86-gcc2-2011-05-29.zip ; +HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-r1a3-x86-gcc4-2011-05-29.zip ; HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-2010-07-26.zip ; Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalLibPackages =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalLibPackages 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalLibPackages 2011-05-30 21:14:11 UTC (rev 41836) @@ -227,8 +227,8 @@ Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libsdl-1.2.14-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libsdl-1.2.14-r1a3-x86-gcc4-2011-05-26.zip ; + libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip + : $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc4-2011-05-29.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip : $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; @@ -264,8 +264,8 @@ : $(baseURL)/lib/smpeg-0.4.5-r1a3-x86-gcc4-2011-05-26.zip ; } else { InstallOptionalHaikuImagePackage - libsdl-1.2.14-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libsdl-1.2.14-r1a3-x86-gcc2-2011-05-19.zip ; + libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip + : $(baseURL)/lib/libsdl-1.2-hg-r1a3-x86-gcc2-2011-05-29.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-r1a3-x86-gcc2-2011-05-19.zip : $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalPackages =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-30 21:14:11 UTC (rev 41836) @@ -264,8 +264,8 @@ Echo "No optional package BePDF available for gcc4" ; } else { InstallOptionalHaikuImagePackage - BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip - : $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip + bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-28.zip + : $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-28.zip : apps ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/BePDF/BePDF ; @@ -275,8 +275,6 @@ AddSymlinkToHaikuImage common data licenses : "/boot/apps/BePDF/license/locale DevKit/LICENSE" : "48HRS Public License" ; - InstallSourceArchive bepdf-1.1.1b3-2010-05-05.tar.xz - : $(baseSourceURL)/2010/bepdf-1.1.1b3-2010-05-05.tar.xz ; } } Modified: haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles 2011-05-30 21:14:11 UTC (rev 41836) @@ -16,7 +16,8 @@ HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; AddGroupToHaikuImage party : 101 : user sshd ; HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 790 ; + HAIKU_IMAGE_SIZE = 690 ; + HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ; AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates WQY-MicroHei ; @@ -38,6 +39,7 @@ AddGroupToHaikuImage party : 101 : user sshd ; HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_SIZE = 500 ; + HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ; AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ; AddOptionalHaikuImagePackages Development Subversion OpenSSH OpenSSL ; Modified: haiku/branches/releases/r1alpha3/build/jam/UserBuildConfig.ReadMe =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/UserBuildConfig.ReadMe 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/jam/UserBuildConfig.ReadMe 2011-05-30 21:14:11 UTC (rev 41836) @@ -62,6 +62,9 @@ HAIKU_IMAGE_DIR = /tmp ; HAIKU_IMAGE_SIZE = 100 ; +# Enable stripping the debug symbols from optional packages. +HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ; + # Set image volume label to "Walter". Default label is "Haiku". HAIKU_IMAGE_LABEL = Walter ; Modified: haiku/branches/releases/r1alpha3/build/scripts/build_haiku_image =================================================================== --- haiku/branches/releases/r1alpha3/build/scripts/build_haiku_image 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/build/scripts/build_haiku_image 2011-05-30 21:14:11 UTC (rev 41836) @@ -16,6 +16,7 @@ # dontClearImage # isVMwareImage # optionalPackageDescriptions +# stripOptionalPackageDebugSymbols # # addattr # copyattr @@ -141,6 +142,20 @@ fi +stripDebugInfo() +{ + file="$1" + + # Determine whether the file is an ELF file by checking the ELF signature, + # or at least the printable characters. + elfMarker=`dd "if=$file" bs=1 skip=1 count=3 2> /dev/null` + if [ "$elfMarker" = 'ELF' ]; then + # make user-writable first -- some files aren't + chmod u+w "$file" + strip --strip-debug "$file" + fi +} + extractFile() { # extractFile <archive> <directory> @@ -173,6 +188,24 @@ rm $extractDir/.OptionalPackageDescription fi + if [ "$stripOptionalPackageDebugSymbols" = "1" ]; then + # strip executables in common/bin + if [ -d $extractDir/common/bin ]; then + for file in `find $extractDir/common/bin -type f -a -perm +100 \ + -a -size +1k`; do + stripDebugInfo "$file" + done + fi + + # strip libraries in common/lib + if [ -d $extractDir/common/lib ]; then + for file in `find $extractDir/common/lib -type f -a -size +1k \ + -a -name lib\*`; do + stripDebugInfo "$file" + done + fi + fi + $cp -r "${sPrefix}$extractDir/$extractedSubDir/." "${tPrefix}$targetExtractedDir" $rmAttrs -rf "$extractDir" Modified: haiku/branches/releases/r1alpha3/data/catalogs/apps/aboutsystem/be.catkeys =================================================================== --- haiku/branches/releases/r1alpha3/data/catalogs/apps/aboutsystem/be.catkeys 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/data/catalogs/apps/aboutsystem/be.catkeys 2011-05-30 21:14:11 UTC (rev 41836) @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-About 3818784234 +1 belarusian x-vnd.Haiku-About 128117018 %.2f GHz AboutView %.2f ГГц %d MiB total AboutView %d MiB усяго %d MiB used (%d%%) AboutView %d MiB выкарыстана (%d%%) @@ -8,17 +8,61 @@ ... and the many people making donations!\n\n AboutView ... і тыя, хто рабіў саве ахвяраванні!\n\n About this system AboutWindow Інфармацыя пра сістэму AboutSystem System name Пра Сістэму +BSD (2-clause) AboutView BSD (2 часткі) +BSD (3-clause) AboutView BSD (3 часткі) +BSD (4-clause) AboutView BSD (4 часткі) Be Inc. and its developer team, for having created BeOS!\n\n AboutView Be Inc. і яе распрацоўшчыкам, за тое што ставарылі BeOS!\n\n +Contains software developed by the NetBSD Foundation, Inc. and its contributors:\nftp, tput\nCopyright © 1996-2008 The NetBSD Foundation, Inc. All rights reserved. AboutView Утрымлівае праграмныя прадукты выдадзеныя NetBSD Foundation, Inc. і яе распрацоўшчыкамі:\nftp, tput\nАўтарскае права © 1996-2008 The NetBSD Foundation, Inc. Правы захаваныя. +Contains software from the FreeBSD Project, released under the BSD license:\ncal, ftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved. AboutView Утрымлівае праграмныя прадукты праекта FreeBSD, выдадзеныя пад ліцэнзіяй BSD:\ncal, ftpd, ping, telnet, telnetd, traceroute\nАўтарскае права © 1994-2008 The FreeBSD Project. Правы захаваныя. +Contains software from the GNU Project, released under the GPL and LGPL licenses:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation. AboutView Утрымлівае праграмныя прадукты праекта GNU, выдадзеныя пад GPL і LGPL ліцэнзіямі:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nАўтарскае права © The Free Software Foundation. Contributors:\n AboutView Удзельнікі:\n -Current maintainers:\n AboutView Дагляднікі:\n +Copyright © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\nAll rights reserved. AboutView Аўтарскае права © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\n Правы захаваныя. +Copyright © 1990-2002 Info-ZIP. All rights reserved. AboutView Аўтарскае права © 1990-2002 Info-ZIP. Правы захаваныя. +Copyright © 1990-2003 Wada Laboratory, the University of Tokyo. AboutView Аўтарскае права © 1990-2003 Wada Laboratory, the University of Tokyo. +Copyright © 1991-2000 Silicon Graphics, Inc. SGI's Software FreeB license. All rights reserved. AboutView Аўтарскае права © 1991-2000 Silicon Graphics, Inc. SGI's Software FreeB license. Правы захаваныя. +Copyright © 1994-1997 Mark Kilgard. All rights reserved. AboutView Аўтарскае права © 1994-1997 Mark Kilgard. Правы захаваныя. +Copyright © 1994-2008 Xiph.Org. All rights reserved. AboutView Аўтарскае права © 1994-2008 Xiph.Org. Правы захаваныя. +Copyright © 1994-2009, Thomas G. Lane, Guido Vollbeding. This software is based in part on the work of the Independent JPEG Group. AboutView Аўтарскае права © 1994-2009, Thomas G. Lane, Guido Vollbeding. This software is based in part on the work of the Independent JPEG Group. +Copyright © 1995, 1998-2001 Jef Poskanzer. All rights reserved. AboutView Аўтарскае права © 1995, 1998-2001 Jef Poskanzer. Правы захаваныя. +Copyright © 1995-2001 Lars Düning. All rights reserved. AboutView Аўтарскае права © 1995-2001 Lars Düning. Правы захаваныя. +Copyright © 1995-2004 Jean-loup Gailly and Mark Adler. AboutView Аўтарскае права © 1995-2004 Jean-loup Gailly and Mark Adler. +Copyright © 1996-1997 Jeff Prosise. All rights reserved. AboutView Аўтарскае права © 1996-1997 Jeff Prosise. Правы захаваныя. +Copyright © 1996-2005 Julian R Seward. All rights reserved. AboutView Аўтарскае права © 1996-2005 Julian R Seward. Правы захаваныя. +Copyright © 1997-2006 PDFlib GmbH and Thomas Merz. All rights reserved.\nPDFlib and PDFlib logo are registered trademarks of PDFlib GmbH. AboutView Аўтарскае права © 1997-2006 PDFlib GmbH and Thomas Merz. All rights reserved.\nPDFlib і PDFlib logo з´яўляюцца зарэгістраванымі гандлёвымі знакамі PDFlib GmbH. +Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper. AboutView Аўтарскае права © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper. +Copyright © 1998-2003 Daniel Veillard. All rights reserved. AboutView Аўтарскае права © 1998-2003 Daniel Veillard. Правы захаваныя. +Copyright © 1999-2000 Y.Takagi. All rights reserved. AboutView Аўтарскае права © 1999-2000 Y.Takagi. Правы захаваныя. +Copyright © 1999-2006 Brian Paul. Mesa3D Project. All rights reserved. AboutView Аўтарскае права © 1999-2006 Brian Paul. Mesa3D Project. Правы захаваныя. +Copyright © 1999-2007 Michael C. Ring. All rights reserved. AboutView Аўтарскае права © 1999-2007 Michael C. Ring. Правы захаваныя. +Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved. AboutView Аўтарскае права © 1999-2010 by the authors of Gutenprint. Правы захаваныя. +Copyright © 2000 Jean-Pierre ervbefeL and Remi Lefebvre. AboutView Аўтарскае права © 2000 Jean-Pierre ervbefeL and Remi Lefebvre. +Copyright © 2000-2007 Fabrice Bellard, et al. AboutView Аўтарскае права © 2000-2007 Fabrice Bellard, et al. +Copyright © 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard. All rights reserved. AboutView Аўтарскае права © 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard. Правы захаваныя. +Copyright © 2001-2003 Expat maintainers. AboutView Аўтарскае права © 2001-2003 Expat maintainers. +Copyright © 2002-2003 Steve Lhomme. All rights reserved. AboutView Аўтарскае права © 2002-2003 Steve Lhomme. Правы захаваныя. +Copyright © 2002-2004 Vivek Mohan. All rights reserved. AboutView Аўтарскае права © 2002-2004 Vivek Mohan. Правы захаваныя. +Copyright © 2002-2005 Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. AboutView Аўтарскае права © 2002-2005 Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. +Copyright © 2002-2006 Maxim Shemanarev (McSeem). AboutView Аўтарскае права © 2002-2006 Maxim Shemanarev (McSeem). +Copyright © 2002-2008 Alexander L. Roshal. All rights reserved. AboutView Аўтарскае права © 2002-2008 Alexander L. Roshal. Правы захаваныя. +Copyright © 2003 Peter Hanappe and others. AboutView Аўтарскае права © 2003 Peter Hanappe і іншыя. +Copyright © 2003-2006 Intel Corporation. All rights reserved. AboutView Аўтарскае права © 2003-2006 Intel Corporation. Правы захаваныя. +Copyright © 2004-2005 Intel Corporation. All rights reserved. AboutView Аўтарскае права © 2004-2005 Intel Corporation. Правы захаваныя. +Copyright © 2006-2007 Intel Corporation. All rights reserved. AboutView Аўтарскае права © 2006-2007 Intel Corporation. Правы захаваныя. +Copyright © 2007 Ralink Technology Corporation. All rights reserved. AboutView Аўтарскае права © 2007 Ralink Technology Corporation. Правы захаваныя. +Copyright © 2007-2009 Marvell Semiconductor, Inc. All rights reserved. AboutView Аўтарскае права © 2007-2009 Marvell Semiconductor, Inc. Правы захаваныя. +Copyright © 2010-2011 Google Inc. All rights reserved. AboutView Аўтарскае права © 2010-2011 Google Inc. Правы захаваныя. +Current maintainers:\n AboutView Распрацоўшчыкі:\n GCC %d Hybrid AboutView GCC %d Hybrid Google & their Google Summer of Code program\n AboutView Google і іх праграма Google Summer of Code\n Kernel: AboutView Ядро: License: AboutView Ліцензія: Licenses: AboutView Лицэнзіі: +MIT (no promotion) AboutView MIT (без рэкламы) +MIT license. All rights reserved. AboutView Ліцэнзія MIT. Правы захаваныя. Memory: AboutView Памяць: Michael Phipps (project founder)\n\n AboutView Michael Phipps (заснавальнік праекту)\n\n Past maintainers:\n AboutView Былыя дагляднікі:\n +Portions of this software are copyright. Copyright © 1996-2006 The FreeType Project. All rights reserved. AboutView Частка гэтага праграмнага прадукта абараняецца аўтарскім правам. Аўтарскае права © 1996-2006 The FreeType Project. Правы захаваныя. Processor: AboutView Працэсар: Revision AboutView Рэвізія Source Code: AboutView Зыходны код: @@ -27,6 +71,7 @@ The Haikuware team and their bounty program\n AboutView Каманда Haikuware і ихнія ахвяраванні\n The University of Auckland and Christof Lutteroth\n\n AboutView The University of Auckland and Christof Lutteroth\n\n The code that is unique to Haiku, especially the kernel and all code that applications may link against, is distributed under the terms of the %MIT licence%. Some system libraries contain third party code distributed under the LGPL license. You can find the copyrights to third party code below.\n\n AboutView Код, унікальны для Haiku, асабіста ядро і ўвесь код, да якога могуць звяртацца праграмы, распаўсюджваецца ў межах %MIT licence%. Некаторыя сістэмныя бібліятэкі змяшчаюць код, які распаўсюджваецца ў межах ліцэнзіі LGPL. Аўтарскія правы на код трэціх старон глядзіце ніжэй.\n\n +The copyright to the Haiku code is property of Haiku, Inc. or of the respective authors where expressly noted in the source. Haiku™ and the HAIKU logo® are (registered) trademarks of Haiku, Inc.\n\n AboutView Аўтарскія правы на зыходны код Haiku належаць Haiku, Inc. ці суадносным аўтарам якія пазначаны ў зыходных тэкстах. Haiku™ і HAIKU logo® з´яўляюцца зарэгістраванымі гандлёвымі знакамі Haiku, Inc.\n\n Time running: AboutView Час працы: Translations:\n AboutView Пераклады:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (асабіста за ядро NewOS)\n Modified: haiku/branches/releases/r1alpha3/data/catalogs/apps/deskbar/be.catkeys =================================================================== --- haiku/branches/releases/r1alpha3/data/catalogs/apps/deskbar/be.catkeys 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/data/catalogs/apps/deskbar/be.catkeys 2011-05-30 21:14:11 UTC (rev 41836) @@ -9,7 +9,7 @@ Clock PreferencesWindow Гадзіннік Close all WindowMenu Закрыць усё Demos B_USER_DESKBAR_DIRECTORY/Demos Прыклады -Deskbar System name Дэскбар +Deskbar System name Deskbar Deskbar preferences PreferencesWindow Наладкі Deskbar Deskbar preferences… BeMenu Наладкі Deskbar... Desktop applets B_USER_DESKBAR_DIRECTORY/Desktop applets Праграмкі Дэсктопу Modified: haiku/branches/releases/r1alpha3/data/catalogs/apps/glteapot/be.catkeys =================================================================== --- haiku/branches/releases/r1alpha3/data/catalogs/apps/glteapot/be.catkeys 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/data/catalogs/apps/glteapot/be.catkeys 2011-05-30 21:14:11 UTC (rev 41836) @@ -1,2 +1,24 @@ -1 belarusian x-vnd.Haiku-GLTeapot 1638063513 -GLTeapot System name Чайнік +1 belarusian x-vnd.Haiku-GLTeapot 2890609668 +Add a teapot TeapotWindow Дадаць чайнік +Backface culling TeapotWindow Адкідаць заднія +Blue TeapotWindow Блакітны +FPS display TeapotWindow Паказваць ФПС +File TeapotWindow Файл +Filled polygons TeapotWindow Запоўненыя палігоны +Fog TeapotWindow Туман +GLTeapot System name GL Чайнік +Gouraud shading TeapotWindow Адценне Gouraud +Green TeapotWindow Зялёны +Lighting TeapotWindow Падсветка +Lights TeapotWindow Ліхтары +Lower left TeapotWindow Знізу злева +Off TeapotWindow Выключыць +Options TeapotWindow Наладкі +Perspective TeapotWindow Перспектыва +Quit TeapotWindow Выйсці +Red TeapotWindow Чырвоны +Right TeapotWindow Зправа +Upper center TeapotWindow Зверху +White TeapotWindow Белы +Yellow TeapotWindow Жоўты +Z-buffered TeapotWindow Z-буферызаваны Copied: haiku/branches/releases/r1alpha3/data/catalogs/apps/mandelbrot/be.catkeys (from rev 41799, haiku/trunk/data/catalogs/apps/mandelbrot/be.catkeys) =================================================================== --- haiku/branches/releases/r1alpha3/data/catalogs/apps/mandelbrot/be.catkeys (rev 0) +++ haiku/branches/releases/r1alpha3/data/catalogs/apps/mandelbrot/be.catkeys 2011-05-30 21:14:11 UTC (rev 41836) @@ -0,0 +1,10 @@ +1 belarusian x-vnd.Haiku-Mandelbrot 3766380907 +File Mandelbrot Файл +Iterations Mandelbrot Паўторы +Mandelbrot System name Фракталы +Palette Mandelbrot Палета +Palette 1 Mandelbrot Плаета 1 +Palette 2 Mandelbrot Палета 2 +Palette 3 Mandelbrot Палета 3 +Palette 4 Mandelbrot Палета 4 +Quit Mandelbrot Выйсці Copied: haiku/branches/releases/r1alpha3/data/catalogs/apps/musiccollection/be.catkeys (from rev 41799, haiku/trunk/data/catalogs/apps/musiccollection/be.catkeys) =================================================================== --- haiku/branches/releases/r1alpha3/data/catalogs/apps/musiccollection/be.catkeys (rev 0) +++ haiku/branches/releases/r1alpha3/data/catalogs/apps/musiccollection/be.catkeys 2011-05-30 21:14:11 UTC (rev 41836) @@ -0,0 +1,2 @@ +1 belarusian x-vnd.MusicCollection 3521119930 +Music Collection System name Музычная калекцыя Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195 /haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freetype2/2.4.4/include:40532 /haiku/vendor/freetype2/current/include:37946-40531 + /haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195 /haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freetype2/2.4.4/include:40532 /haiku/vendor/freetype2/current/include:37946-40531 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/png.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568 /haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libpng/1.4.4/png.h:39522 /haiku/vendor/libpng/current/png.h:35840-39521 + /haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568 /haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libpng/1.4.4/png.h:39522 /haiku/vendor/libpng/current/png.h:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568 /haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libpng/1.4.4/pngconf.h:39522 /haiku/vendor/libpng/current/pngconf.h:35840-39521 + /haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568 /haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libpng/1.4.4/pngconf.h:39522 /haiku/vendor/libpng/current/pngconf.h:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702 /haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702 /haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/acpica/current:33139-36866 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/acpica/current:33139-36866 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 Modified: haiku/branches/releases/r1alpha3/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp 2011-05-30 21:14:11 UTC (rev 41836) @@ -44,6 +44,38 @@ #ifdef USE_SSL +class InitSSL { +public: + InitSSL() + { + if (SSL_library_init() != 1) { + fInit = false; + return; + } + + RAND_seed(this, sizeof(InitSSL)); + /*--- Because we're an add-on loaded at an unpredictable time, all the + memory addresses and things contained in ourself are esssentially + random. */ + fInit = true; + return; + }; + + + status_t + InitCheck() + { + return fInit ? B_OK : B_ERROR; + } + +private: + bool fInit; +}; + + +static InitSSL gInitSSL; + + class SSLConnection : public SocketConnection { public: SSLConnection(); @@ -60,9 +92,6 @@ SSL_CTX* fCTX; SSL* fSSL; BIO* fBIO; - - // ssl seems to be not thread save - BLocker fLocker; }; #endif @@ -255,20 +284,13 @@ if (fSSL != NULL) Disconnect(); - BAutolock _(fLocker); + if (gInitSSL.InitCheck() != B_OK) + return B_ERROR; status_t status = SocketConnection::Connect(server, port); if (status != B_OK) return status; - if (SSL_library_init() != 1) - return B_ERROR; - SSL_load_error_strings(); - RAND_seed(this, sizeof(SSLConnection)); - /*--- Because we're an add-on loaded at an unpredictable time, all - the memory addresses and things contained in ourself are - esssentially random. */ - fCTX = SSL_CTX_new(SSLv23_method()); fSSL = SSL_new(fCTX); fBIO = BIO_new_socket(fSocket, BIO_NOCLOSE); @@ -289,7 +311,6 @@ SSLConnection::Disconnect() { TRACE("SSLConnection::Disconnect()\n"); - BAutolock _(fLocker); if (fSSL) SSL_shutdown(fSSL); @@ -308,14 +329,11 @@ status_t SSLConnection::WaitForData(bigtime_t timeout) { - fLocker.Lock(); if (!fSSL) return B_ERROR; if (SSL_pending(fSSL) > 0) { - fLocker.Unlock(); return B_OK; } - fLocker.Unlock(); return SocketConnection::WaitForData(timeout); } @@ -323,7 +341,6 @@ int32 SSLConnection::Read(char* buffer, uint32 nBytes) { - BAutolock _(fLocker); if (!fSSL) return B_ERROR; return SSL_read(fSSL, buffer, nBytes); @@ -333,7 +350,6 @@ int32 SSLConnection::Write(const char* buffer, uint32 nBytes) { - BAutolock _(fLocker); if (!fSSL) return B_ERROR; return SSL_write(fSSL, buffer, nBytes); Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 + /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 Property changes on: haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /trunk/current/src/build/libbe/storage/mime:11-11768 + /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /trunk/current/src/build/libbe/storage/mime:11-11768 Modified: haiku/branches/releases/r1alpha3/src/kits/tracker/StatusWindow.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/tracker/StatusWindow.cpp 2011-05-30 19:53:14 UTC (rev 41835) +++ haiku/branches/releases/r1alpha3/src/kits/tracker/StatusWindow.cpp 2011-05-30 21:14:11 UTC (rev 41836) @@ -681,11 +681,16 @@ BString BStatusView::_DestinationString(float* _width) { - BString buffer(B_TRANSLATE("To: %dir")); - buffer.ReplaceFirst("%dir", fDestDir); + if (fDestDir.Length() > 0) { + BString buffer(B_TRANSLATE("To: %dir")); + buffer.ReplaceFirst("%dir", fDestDir); - *_width = ceilf(StringWidth(buffer.String())); - return buffer; + *_width = ceilf(StringWidth(buffer.String())); + return buffer; + } else { + *_width = 0; + return BString(); + } } Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 + /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 Property changes on: haiku/branches/releases/r1alpha3/src/libs/png ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 + /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/src/libs/tiff ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701 + /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701