Fix compile error due to faulty merge.
authorNathan Letwory <nathan@letworyinteractive.com>
Fri, 22 Jul 2011 14:13:28 +0000 (14:13 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Fri, 22 Jul 2011 14:13:28 +0000 (14:13 +0000)
commit8c5f028f4a8600e961fa0dbe4a884261f10f8098
treefcd84ac92fba7b1d9aaf9c9eed8d11316956473b
parent7b1bb26135442a63b6f20f14a04ead0453e0958a
Fix compile error due to faulty merge.
intern/ghost/intern/GHOST_SystemX11.cpp