← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to include/client/mir_toolkit/cursors.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/client/mir_toolkit/cursors.h
27
27
 */
28
28
 
29
29
/* This is C code. Not C++. */
 
30
#ifdef __cplusplus
 
31
extern "C" {
 
32
#endif
30
33
 
31
34
/**
32
35
 * A special cursor name for use with mir_cursor_configuration_from_name
110
113
 */
111
114
extern char const* const mir_hsplit_resize_cursor_name;
112
115
 
 
116
#ifdef __cplusplus
 
117
}
 
118
#endif
113
119
/**@}*/
114
120
 
115
121
#endif