triplea/triplea-0.9.0.2-getWindows_conflict.patch

22 lines
887 B
Diff
Raw Permalink Normal View History

diff -Nru triplea_0_9_0_2.orig/src/games/strategy/debug/Console.java triplea_0_9_0_2/src/games/strategy/debug/Console.java
--- triplea_0_9_0_2.orig/src/games/strategy/debug/Console.java 2007-01-17 19:43:56.000000000 +0100
+++ triplea_0_9_0_2/src/games/strategy/debug/Console.java 2008-03-11 11:26:48.000000000 +0100
@@ -275,7 +275,7 @@
result.append(getThreadDumps());
result.append(getProperties());
result.append(getMemory());
- result.append(getWindows());
+ result.append(getMyWindows());
result.append("ENGINE VERSION").append(EngineVersion.VERSION).append("\n");
@@ -283,7 +283,7 @@
return result.toString();
}
- public static String getWindows()
+ public static String getMyWindows()
{
StringBuilder builder = new StringBuilder("WINDOWS\n");