Merge branch 'master' into package-management

Browse Source

Conflicts:
	build/jam/HaikuImage
	src/system/kernel/arch/x86/64/arch.S

...

This commit is contained in:

Ingo Weinhold

2013-05-12 00:18:19 +02:00

parent 3c94ecf6b4 88cc420211

commit c663ca2171

322 changed files with 4776 additions and 2867 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

data/system/data/fonts/ttfonts/VL-Gothic-Regular.ttf

BIN

Binary file not shown.

data/system/data/fonts/ttfonts/VL-PGothic-Regular.ttf

BIN

Binary file not shown.