Adrien Destugues
d2165f0b29
Merge 42139 too. Sorry again!
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42194 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-15 20:00:22 +00:00
Adrien Destugues
0765addd12
Merge userguide and missing drivesetup fix.
...
Sorry, I messed up something in the previous merge apparently.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42190 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-15 18:14:33 +00:00
Adrien Destugues
61f1e69059
Merge 42117-42142.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42152 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-13 18:03:15 +00:00
Adrien Destugues
905167ad16
Merge 42083-42104
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42108 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-11 21:47:42 +00:00
Adrien Destugues
c113cd7bca
Merge 42071
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42095 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-11 07:10:48 +00:00
Adrien Destugues
cbca4da9bc
Merge 41910 and 41971-42056 from trunk
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42061 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-08 20:15:06 +00:00
Adrien Destugues
92d3743537
Merge 41971,41974
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41977 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-06 17:30:50 +00:00
Adrien Destugues
cfc3a6c5c7
Merge 41890-41941 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41944 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-05 19:06:49 +00:00
Adrien Destugues
fc62a3cbd6
Merge 41863,41866,41881.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41884 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-03 17:44:07 +00:00
Adrien Destugues
1a1be8ad11
Merge 41574 from trunk (this was forgotten long ago)
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41861 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-06-01 20:09:09 +00:00
Adrien Destugues
719cc95e8b
Merge 41837-41855
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41856 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-31 21:10:06 +00:00
Adrien Destugues
8cd3e55f05
Merge 41799-41828.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41836 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-30 21:14:11 +00:00
Adrien Destugues
e1f53575c0
Merge 41744-41784 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41789 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-28 10:06:23 +00:00
Matt Madia
53e20c9955
Merged r41767 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41768 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-27 01:35:19 +00:00
Michael Lotz
56d7a291c9
* Merge r41726 from trunk as it fixes some missing interrupt routing when using
...
the IO-APIC.
* Merge r41758 from trunk as well, but with disabled panics in the fallback
cases. It is needed to complete the routing when the IO-APIC is enabled.
This also prevents the IO-APIC from being used if the routing can't be fully
established. With the disabled panics it will simply print the reason and fall
back to PIC mode.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41759 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-26 12:59:18 +00:00
Adrien Destugues
3caf8f1f03
Merge 41711,41720,41737
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41748 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-25 18:21:54 +00:00
Adrien Destugues
df50651668
Merge from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41718 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-24 19:13:20 +00:00
Michael Lotz
84ba8d05f9
Manually apply r41690 to the r1alpha3 branch as it fixes EHCI interrupt issues
...
on some chipsets.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41693 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-23 22:04:15 +00:00
Adrien Destugues
c372e0fe51
Merge from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41666 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 20:46:55 +00:00
Adrien Destugues
8a226db351
Merge 41662: layout fixes in filetypes.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41663 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 20:07:14 +00:00
Adrien Destugues
d6eff13b61
Merge 41658 from trunk. (usb fix)
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41659 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 18:48:49 +00:00
Adrien Destugues
a6dc469c33
Update userguide and catkeys.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41657 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 18:36:43 +00:00
Adrien Destugues
9707fc6bd3
Merge 41651 from trunk : fix IMAP bug with long server messages
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41654 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 16:41:28 +00:00
Adrien Destugues
da514ec17c
Merge 4164[0,6-9] from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41650 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-22 07:51:12 +00:00
Adrien Destugues
c358d2e08c
Merge 41637-8 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41639 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 18:37:37 +00:00
Adrien Destugues
acbec17c41
Merge from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41634 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 16:15:36 +00:00
Adrien Destugues
10ef2ab9cc
Merge 41629 from trunk (fix escaping in linkcatkeys)
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41631 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 14:43:45 +00:00
Adrien Destugues
ff9c443345
Merge from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41627 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 10:48:56 +00:00
Adrien Destugues
b66ef82602
Merge 41613,41614,41606,41624 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41625 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 09:08:01 +00:00
Matt Madia
1cf7781fbb
Updated installoptionalpackage to pull data files from the R1 Alpha 3 branch,
...
instead of trunk.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41623 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-21 02:17:06 +00:00
Adrien Destugues
6477268c4c
Merge 41610.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41612 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-20 21:19:13 +00:00
Adrien Destugues
34aa9e74d8
Merge 41598, 41602-5, 41607-8 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41609 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-20 20:03:16 +00:00
Adrien Destugues
f10a77aabb
Merge from trunk :
...
* Decorator refactoring and appearance preflet
* Localize Mandelbrot
* Optional packages
* Broadcom kernel panic fix
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41594 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-19 20:38:53 +00:00
Adrien Destugues
465c575c64
Merge r41564 from trunk.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41571 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-18 20:13:54 +00:00
Michael Lotz
8868830f15
Merge r41551 from trunk into r1alpha3 branch:
...
Add the ACPI module (and the DPC dependency) to the floppy boot image. It is
used for el-torito booting the CD and anyboot images. Due to the previous lack
of the ACPI module on these, IO-APICs wouldn't get enabled on CD or anyboot
images booted via CD drives.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41552 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-17 12:04:17 +00:00
Rene Gollent
d45db3e933
Add missing alpha 3 version definition.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41550 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 22:14:34 +00:00
Adrien Destugues
70d8dd6740
... I'll get it right someday...
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41547 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 20:25:11 +00:00
Adrien Destugues
d42b7dd22a
Oops. We still have a bug with utf-8 somewhere...
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41546 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 20:21:40 +00:00
Adrien Destugues
2ff193b308
Update version info.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41545 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 20:19:55 +00:00
Adrien Destugues
4910e4bc49
Branch for Alpha3 release. Please now tag your commits with +alpha3 if you want them to land there, or merge them yourself.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41544 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 19:23:23 +00:00
Alexander von Gluck IV
6c43ea6336
read and store aperture size (will be used in fblocation calculations)
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41543 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 18:10:49 +00:00
Joachim Seemer
f3c3902ce1
Maybe the B_TRANSLATE_COMMENT was too long for HTA? Tried taos' patch of #7494 .
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41542 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 17:44:23 +00:00
Jérôme Duval
22f4c33994
* select idle alternate when stopping the UVC device.
...
* set up a dumb deframer.
* received isochronous buffers can be zero length: loop instead of breaking.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41541 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 17:31:38 +00:00
Alexander von Gluck IV
ce8044a8cb
card ids are ordered by series as the AMD pciid space is nowhere near sequential; also removing the series word as it doesn't align to the other entries
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41540 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 16:35:26 +00:00
Oliver Tappe
2fe19bf6ac
Adjusted code for determining the revision in order to hopefully work on FreeBSD, too
...
* convert determine_haiku_revision to only contain functions and now pass the arguments
via function call
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41539 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 16:11:42 +00:00
Philippe Houdoin
b6ba1daaac
There is no point trying to request back from DHCP a link-local
...
auto-configured address...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41538 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 16:00:18 +00:00
Philippe Houdoin
d7a82feb5c
Added a few Radeon HD 48xx devices IDs.
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41537 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 15:19:02 +00:00
Michael Lotz
aa373c439f
We have to decouple the enumeration and marking of the NMIs from the actual NMI
...
pin configuration as the configuration only happens after preparing the
configuration where we already need the NMI mask.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41536 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 14:59:25 +00:00
Philippe Houdoin
0f6581066d
Remove "Parallel Port" print transport add-on from image: until we've a /dev/parallel driver to
...
actually support it, it make no point to let people think a parallel printer *may* be supported.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41535 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 14:50:26 +00:00
Alexander von Gluck IV
f60710603b
be more consistent in bitwise unit conversions
...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41534 a95241bf-73f2-0310-859d-f6bbb57e9c96
2011-05-16 14:46:23 +00:00
