diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
commit | 103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb (patch) | |
tree | 8fd9a6b770998717f4555e7121fb16116b441865 /intern/ghost/intern/GHOST_SystemX11.h | |
parent | eb21bdd249427465a093a078cda7864309a8f735 (diff) | |
parent | 869d654cccba8b9b0bc295e7ce89e8e322912023 (diff) |
Merged changes from trunk r58324-58419.ge_dev
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemX11.h')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 6a492f64b41..1f95e4b1ce2 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -238,7 +238,7 @@ public: #endif /* Helped function for get data from the clipboard. */ - void getClipboard_xcout(XEvent evt, Atom sel, Atom target, + void getClipboard_xcout(const XEvent *evt, Atom sel, Atom target, unsigned char **txt, unsigned long *len, unsigned int *context) const; |