Author: bonefish Date: 2010-04-20 22:35:36 +0200 (Tue, 20 Apr 2010) New Revision: 36387 Changeset: http://dev.haiku-os.org/changeset/36387/haiku Added: haiku/branches/releases/r1alpha2/headers/build/private/shared/Keymap.h haiku/branches/releases/r1alpha2/headers/build/private/storage/FileIO.h haiku/branches/releases/r1alpha2/src/build/libbe/storage/FileIO.cpp haiku/branches/releases/r1alpha2/src/build/libshared/ Modified: haiku/branches/releases/r1alpha2/ haiku/branches/releases/r1alpha2/build/jam/HaikuImage haiku/branches/releases/r1alpha2/build/jam/OptionalPackages haiku/branches/releases/r1alpha2/build/scripts/build_haiku_image haiku/branches/releases/r1alpha2/configure haiku/branches/releases/r1alpha2/docs/userguide/en/applications.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/ haiku/branches/releases/r1alpha2/docs/userguide/en/applications/activitymonitor.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/bepdf.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/bezillabrowser.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/cdplayer.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/charactermap.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/codycam.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/deskcalc.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/diskprobe.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/diskusage.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/drivesetup.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/expander.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/icon-o-matic.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/installer.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/magnify.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/mail.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/mediaplayer.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/midiplayer.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/packageinstaller.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/pe.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/people.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/poorman.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/screenshot.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/showimage.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/soundrecorder.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/stylededit.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/terminal.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/textsearch.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/tv.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/vision.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/vlc.html haiku/branches/releases/r1alpha2/docs/userguide/en/applications/wonderbrush.html haiku/branches/releases/r1alpha2/docs/userguide/en/attributes.html haiku/branches/releases/r1alpha2/docs/userguide/en/bootloader.html haiku/branches/releases/r1alpha2/docs/userguide/en/contents.html haiku/branches/releases/r1alpha2/docs/userguide/en/demos.html haiku/branches/releases/r1alpha2/docs/userguide/en/deskbar.html haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets.html haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/ haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/launchbox.html haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/networkstatus.html haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/processcontroller.html haiku/branches/releases/r1alpha2/docs/userguide/en/filesystem-layout.html haiku/branches/releases/r1alpha2/docs/userguide/en/filetypes.html haiku/branches/releases/r1alpha2/docs/userguide/en/gui.html haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/activitymonitor.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/cdplayer.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/charactermap.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/codycam.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskprobe-about-attr.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskprobe.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskusage.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/expander-preferences.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/expander.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/i-o-m-gradients.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/i-o-m-overview.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/magnify.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/people-files.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/people.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/poorman.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/screenshot-options.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/screenshot.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/stylededit.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/terminal.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/attributes-images/people.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/calendar.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/configure.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/list-of-apps.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/desktop-applets-images/launchbox.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/filesystem-layout-images/achtung-system.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/filesystem-layout-images/achtung-user.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/filetypes-images/filetype-addon-stylededit.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/filetypes-images/filetype-addon.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/favorites.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/gui.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/open-save.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/appearance-antialiasing.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/appearance-colors.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/backgrounds.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/datatranslations.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-filter-header.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-filter-spam.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-in.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-mailbox.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-out.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-settings.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/fonts.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/keyboard.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/keymap.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/mouse.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/network.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screen.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screensaver-fade.png haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screensaver-modules.png [... truncated: 128 changed files follow ...] Log: Merged r36349-r36350, r36353, r36355-r36357, r36360-r36368, r36370-r36371, r36375, r36379, r36381-r36385 from trunk into branch. Property changes on: haiku/branches/releases/r1alpha2 ___________________________________________________________________ Added: svn:mergeinfo + /haiku/trunk:36349-36350,36353,36355-36357,36360-36368,36370-36371,36375,36379,36381-36385 Modified: haiku/branches/releases/r1alpha2/build/jam/HaikuImage =================================================================== --- haiku/branches/releases/r1alpha2/build/jam/HaikuImage 2010-04-20 19:53:31 UTC (rev 36386) +++ haiku/branches/releases/r1alpha2/build/jam/HaikuImage 2010-04-20 20:35:36 UTC (rev 36387) @@ -165,14 +165,14 @@ $(X86_ONLY)ati ; SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ; -SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x - $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 - $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci - $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 - $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus - $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900 +SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x + $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 + $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci + $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 + $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus + $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900 $(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance - $(X86_ONLY)vt612x wb840 + $(X86_ONLY)vt612x wb840 # WLAN drivers $(X86_ONLY)aironetwifi $(X86_ONLY)atheroswifi $(X86_ONLY)broadcom43xx @@ -193,7 +193,7 @@ local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ; local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ; if $(archive) { - AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) + AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) : $(extract) ; } } @@ -642,7 +642,8 @@ # GCC and unzip onto our image. Building the archive is done by a sub-jam. include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ; -if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { +if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1 + && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # let another jam build a zip with the system libraries rule InvokeSubJam target : directory : jamLine { Modified: haiku/branches/releases/r1alpha2/build/jam/OptionalPackages =================================================================== --- haiku/branches/releases/r1alpha2/build/jam/OptionalPackages 2010-04-20 19:53:31 UTC (rev 36386) +++ haiku/branches/releases/r1alpha2/build/jam/OptionalPackages 2010-04-20 20:35:36 UTC (rev 36387) @@ -6,7 +6,8 @@ # packages. (It does not matter if a package was built with either compiler, # the system should have the respective other system libs.) local isHybridBuild ; -if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { +if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1 + && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { isHybridBuild = 1 ; } @@ -725,7 +726,7 @@ # MandatoryPackages -if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] { +if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] { # Pseudo package for grouping packages, which are added to all images. } Modified: haiku/branches/releases/r1alpha2/build/scripts/build_haiku_image =================================================================== --- haiku/branches/releases/r1alpha2/build/scripts/build_haiku_image 2010-04-20 19:53:31 UTC (rev 36386) +++ haiku/branches/releases/r1alpha2/build/scripts/build_haiku_image 2010-04-20 20:35:36 UTC (rev 36387) @@ -43,6 +43,8 @@ normalizedImagePath='' if readlink -f "$imagePath" > /dev/null 2>&1 ; then normalizedImagePath=$(readlink -f "$imagePath") + elif realpath "$imagePath" > /dev/null 2>&1 ; then + normalizedImagePath=$(realpath "$imagePath") elif greadlink -f "$imagePath" > /dev/null 2>&1 ; then normalizedImagePath=$(greadlink -f "$imagePath") fi Modified: haiku/branches/releases/r1alpha2/configure =================================================================== --- haiku/branches/releases/r1alpha2/configure 2010-04-20 19:53:31 UTC (rev 36386) +++ haiku/branches/releases/r1alpha2/configure 2010-04-20 20:35:36 UTC (rev 36387) @@ -144,6 +144,14 @@ # standard_gcc_settings() { + if which greadlink > /dev/null 2>&1; then + readlink="greadlink -e" + elif which realpath > /dev/null 2>&1; then + readlink=realpath + else + readlink="readlink -e" + fi + # PLATFORM_LINKLIBS gcclib=`$HAIKU_CC -print-libgcc-file-name` gccdir=`dirname ${gcclib}` @@ -184,23 +192,33 @@ $headers/$d" done - # when not building the crosscompiler, to use cpp headers from - # tree first, but fallback to local C++ system headers (like <new>) - # if [ "$buildCrossTools" = "" ]; then - # HAIKU_CXX_HEADERS_DIR="headers/cpp $HAIKU_CXX_HEADERS_DIR" - # fi + # Unset the HAIKU_{SHARED,STATIC}_LIB{STD,SUP}CXX variables, if the + # compiler didn't give us actual file names. Otherwise resolve + # symlinks to avoid problems when copying the libraries to the + # image. if [ $HAIKU_STATIC_LIBSTDCXX = libstdc++.a ]; then HAIKU_STATIC_LIBSTDCXX= + else + HAIKU_STATIC_LIBSTDCXX=`$readlink $HAIKU_STATIC_LIBSTDCXX` fi + if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then HAIKU_SHARED_LIBSTDCXX= + else + HAIKU_SHARED_LIBSTDCXX=`$readlink $HAIKU_SHARED_LIBSTDCXX` fi + if [ $HAIKU_STATIC_LIBSUPCXX = libsupc++.a ]; then HAIKU_STATIC_LIBSUPCXX= + else + HAIKU_STATIC_LIBSUPCXX=`$readlink $HAIKU_STATIC_LIBSUPCXX` fi + if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then HAIKU_SHARED_LIBSUPCXX= + else + HAIKU_SHARED_LIBSUPCXX=`$readlink $HAIKU_SHARED_LIBSUPCXX` fi ;; 2.9*) @@ -241,7 +259,7 @@ path="`pwd`/`basename "$path"`" cd $oldPwd else - which "$path" &> /dev/null || { + which "$path" > /dev/null 2>&1 || { echo "Build tool \"$path\" not found." >&2 exit 1 } @@ -292,13 +310,13 @@ HAIKU_HOST_USE_32BIT=0 HAIKU_HOST_USE_XATTR=0 HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR= -HAIKU_ADD_ALTERNATIVE_GCC_LIBS= +HAIKU_ADD_ALTERNATIVE_GCC_LIBS=0 HOST_GCC_LD=`gcc -print-prog-name=ld` HOST_GCC_OBJCOPY=`gcc -print-prog-name=objcopy` SFDISK_BINARY=sfdisk HOST_SFDISK=$SFDISK_BINARY -haikuRequiredLegacyGCCVersion="2.95.3-haiku-090629" +haikuRequiredLegacyGCCVersion="2.95.3-haiku-100420" export haikuRequiredLegacyGCCVersion # version of legacy gcc required to build haiku @@ -448,6 +466,7 @@ 0.[0-6].*) ;; *) versionOK=1 ;; esac +versionOK=1 if [ $versionOK = 0 ]; then echo "The yasm assembler version 0.7.0 or later must be installed." Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/activitymonitor.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/bepdf.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/bezillabrowser.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/cdplayer.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/charactermap.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/codycam.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/deskcalc.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/diskprobe.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/diskusage.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/drivesetup.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/expander.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/icon-o-matic.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/installer.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/magnify.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/mail.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/mediaplayer.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/midiplayer.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/packageinstaller.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/pe.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/people.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/poorman.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/screenshot.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/showimage.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/soundrecorder.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/stylededit.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/terminal.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/textsearch.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/tv.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/vision.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/vlc.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications/wonderbrush.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/applications.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/attributes.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/bootloader.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/contents.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/demos.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/deskbar.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/launchbox.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/networkstatus.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets/processcontroller.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/desktop-applets.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/filesystem-layout.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/filetypes.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/gui.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/activitymonitor.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/cdplayer.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/charactermap.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/codycam.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskprobe-about-attr.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskprobe.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/diskusage.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/expander-preferences.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/expander.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/i-o-m-gradients.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/i-o-m-overview.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/magnify.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/people-files.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/people.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/poorman.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/screenshot-options.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/screenshot.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/stylededit.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/apps-images/terminal.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/attributes-images/people.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/calendar.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/configure.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/deskbar-images/list-of-apps.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/desktop-applets-images/launchbox.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/filesystem-layout-images/achtung-system.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/filesystem-layout-images/achtung-user.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/filetypes-images/filetype-addon-stylededit.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/filetypes-images/filetype-addon.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/favorites.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/gui.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/gui-images/open-save.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/appearance-antialiasing.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/appearance-colors.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/backgrounds.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/datatranslations.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-filter-header.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-filter-spam.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-in.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-mailbox.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-out.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/e-mail-settings.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/fonts.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/keyboard.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/keymap.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/mouse.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/network.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screen.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screensaver-fade.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/screensaver-modules.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/sounds.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/time-time.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/time-timezone.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/prefs-images/virtualmemory.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/queries-images/basic-query.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/queries-images/formula-query.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/queries-images/query-window-filled.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/queries-images/query-window.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/queries-images/result-window.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/teammonitor-images/teammonitor.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/drill-down.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/get-info.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/mount-settings.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/new-menu.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/open-with-preferred.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/open-with.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/tracker-preferences-navigator.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/transaction-status.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/window-drill-down.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/window-menu.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/tracker-images/window-type-ahead.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workshop-filetypes+attributes-images/filetype-extra-attribute.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-new-file-type.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workshop-filetypes+attributes-images/query-dvddb.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/images/workspaces-images/workspaces.png ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/index.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/keyboard-shortcuts.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/appearance.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/backgrounds.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/datatranslations.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/e-mail.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/filetypes.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/fonts.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/keyboard.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/keymap.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/media.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/mouse.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/network.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: haiku/branches/releases/r1alpha2/docs/userguide/en/preferences/printers.html [... truncated: 1627 lines follow ...]