Updated with latest from trunk

svn-id: r53976

2 files changed, 6 insertions, 4 deletions

diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index df7063c08a..db8e41af48 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -69,6 +69,8 @@ else
 	# TODO: Inherit the earth uses so much RAM that I have removed libmad in order to
 	# claw some back.	
 
+
+
 	else
 		ifdef DS_BUILD_I
 
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp
index 71f4f93c27..581509f939 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.cpp
+++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp
@@ -177,7 +177,7 @@ void drawText(int tx, int ty, const char *string, bool highlight) {
 			baseAddress[ty * 32 + tx + p] = baseValue | tile;
 		}
 	}
-	
+
 }
 
 
@@ -292,7 +292,7 @@ void drawAutoComplete() {
 		// When there's no completions on the bottom of the screen, it acts like a mouse pad
 		// so this text indicates that
 		drawText(11, 18, "MOUSE AREA", true);
-		
+
 
 	} else {
 
@@ -303,10 +303,10 @@ void drawAutoComplete() {
 		for (int r = 0; r < autoCompleteCount; r++) {
 			int y = 12 + (r % 6) * 2;
 			int x = 0 + ((r / 6) * 16);
-	
+
 			drawText(x, y, autoCompleteWord[r], selectedCompletion == r);
 		}
-	
+
 	}
 }