Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Nekotekina · Dec 14, 2013 · 01a274a · 01a274a
2 parents eed6a7f + e2de06d
commit 01a274a
Show file tree

Hide file tree

Showing 7 changed files with 1,411 additions and 1,004 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,5 +40,13 @@
 /bin/VertexProgram.txt
 /bin/BreakPoints.dat
 /bin/textures
-/bin/data/
 rpcs3/git-version.h
+
+# Copyrighted files
+/bin/data/
+/bin/dev_flash/data/font
+
+# Ignore installed games except test homebrews
+!/bin/dev_hdd0/game/
+/bin/dev_hdd0/game/*
+!/bin/dev_hdd0/game/TEST12345/
diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp
@@ -40,7 +40,7 @@ static const g_module_list[] =
 	{0x0017, "sys_io"},
 	{0x0018, "cellPngDec"},
 	{0x0019, "cellFont"},
-	{0x001a, "cellFontFt"},
+	{0x001a, "cellFontFT"},
 	{0x001b, "cellFreetype"},
 	{0x001c, "cellUsbd"},
 	{0x001d, "cellSail"},