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 
Conflicts:
	src/servers/app/ServerWindow.cpp
This commit is contained in:
Alex Smith
2012-08-16 21:11:15 +01:00
parent 602d9c96a5 8ffa652cac
commit e688bf23d4
445 changed files with 7063 additions and 5041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/config/HaikuConfig.h
+1
View File
@@ -36,6 +36,7 @@
# define __HAIKU_ARCH ppc
# define __HAIKU_ARCH_ABI "ppc"
# define __HAIKU_ARCH_PPC 1
# define __HAIKU_ARCH_PHYSICAL_BITS 64
# define __HAIKU_BIG_ENDIAN 1
#elif __M68K__
# define __HAIKU_ARCH m68k