Merge branch 'package-management'

Conflicts: src/preferences/network/Jamfile
2013-09-27 02:01:12 +02:00
parent 23afdc2ba4 81291304ad
commit 9f81ca838c
1477 changed files with 63420 additions and 53378 deletions
@@ -13,7 +13,7 @@ Preference Keymap :
 	KeymapWindow.cpp
 	ModifierKeysWindow.cpp

-	: be tracker $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSTDC++)
+	: be tracker localestub libshared.a $(TARGET_LIBSTDC++)
 	: Keymap.rdef
 ;