Alex Smith e688bf23d4 Merge branch 'master' into x86_64 ... Conflicts: src/servers/app/ServerWindow.cpp		2012-08-16 21:11:15 +01:00
..
HaikuConfig.h	ppc: use 64 bit physical addressing	2012-08-15 19:41:52 +02:00
types.h