← Back to branch summary

~ubuntu-branches/ubuntu/wily/libx11/wily-proposed

« back to all changes in this revision

Viewing changes to include/X11/Xcms.h

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-02-24 12:02:14 UTC
  • mfrom: (1.1.12 upstream) (2.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110224120214-a86d0lv48wk8itl6
Tags: 2:1.4.1-5ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add Latin locale.
  - Add Klingon locale.
  - Add 102_double_arrows_Compose.patch: compose keys for double arrows
    (LP: 680143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/X11/Xcms.h
26
26
 *      DESCRIPTION
27
27
 *              Public include file for X Color Management System
28
28
 */
29
 
#ifndef _XCMS_H_
30
 
#define _XCMS_H_
 
29
#ifndef _X11_XCMS_H_
 
30
#define _X11_XCMS_H_
31
31
 
32
32
#include <X11/Xlib.h>
33
33
 
800
800
 
801
801
_XFUNCPROTOEND
802
802
 
803
 
#endif /* _XCMS_H_ */
 
803
#endif /* _X11_XCMS_H_ */