From 8c5f028f4a8600e961fa0dbe4a884261f10f8098 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 22 Jul 2011 14:13:28 +0000
Subject: [PATCH] Fix compile error due to faulty merge.

---
 intern/ghost/intern/GHOST_SystemX11.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index ef182a36539..517c3a1ebac 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -75,6 +75,9 @@
 #include <stdio.h> // for fprintf only
 #include <cstdlib> // for exit
 
+static GHOST_TKey
+convertXKey(KeySym key);
+
 //these are for copy and select copy
 static char *txt_cut_buffer= NULL;
 static char *txt_select_buffer= NULL;