Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3375bd4 in mainline

Timestamp:
2011-05-17T07:44:17Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
04c418d, 2586860, 5e6e50b
Parents:
72cd53d (diff), 0d8a304 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

Files:
24 added
17 deleted
155 edited
13 moved

Changeset view not shown, since the total size (2.7 MB) exceeds 976.6 KB

Note: See TracChangeset for help on using the changeset viewer.