Commit 27a69f55 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

fix bad merge

parent adedeafd
......@@ -167,7 +167,7 @@ extern int _Xutf8TextPropertyToTextList(
extern int _XmbTextListToTextProperty(
XLCd /* lcd */,
Display* /* dpy */,
wchar_t** /* list */,
char** /* list */,
int /* count */,
XICCEncodingStyle /* style */,
XTextProperty* /* text_prop */
......@@ -176,7 +176,7 @@ extern int _XmbTextListToTextProperty(
extern int _XwcTextListToTextProperty(
XLCd /* lcd */,
Display* /* dpy */,
char** /* list */,
wchar_t** /* list */,
int /* count */,
XICCEncodingStyle /* style */,
XTextProperty* /* text_prop */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment