i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x86_64

Browse Source
This commit is contained in:
Alex Smith
2012-06-13 17:47:34 +01:00
parent f76bc433e1 d8bddb6d01
commit ced5037133
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ReleaseBuildProfiles
+1 -3
View File
@@ -16,8 +16,7 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
AddGroupToHaikuImage party : 101 : user sshd ; AddGroupToHaikuImage party : 101 : user sshd ;
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 750 ; HAIKU_IMAGE_SIZE = 800 ;
HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates
WQY-MicroHei ; WQY-MicroHei ;
@@ -40,7 +39,6 @@ switch $(HAIKU_BUILD_PROFILE) {
AddGroupToHaikuImage party : 101 : user sshd ; AddGroupToHaikuImage party : 101 : user sshd ;
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 500 ; HAIKU_IMAGE_SIZE = 500 ;
HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ; AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ;
AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ; AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ;
src/preferences/touchpad/TouchpadPrefView.cpp
+1
View File
@@ -375,6 +375,7 @@ TouchpadPrefView::SetupView()
fScrollAccelSlider->SetHashMarkCount(7); fScrollAccelSlider->SetHashMarkCount(7);
fScrollAccelSlider->SetLimitLabels(B_TRANSLATE("Slow"), fScrollAccelSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast")); B_TRANSLATE("Fast"));
fScrollAccelSlider->SetExplicitMinSize(BSize(150, B_SIZE_UNSET));
fScrollStepXSlider = new BSlider("scroll_stepX", fScrollStepXSlider = new BSlider("scroll_stepX",
B_TRANSLATE("Horizontal"), B_TRANSLATE("Horizontal"),