← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/xkb/XKBAlloc.c

  • 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:
src/xkb/XKBAlloc.c
33
33
#ifndef XKB_IN_SERVER
34
34
 
35
35
#include <stdio.h>
36
 
#define NEED_REPLIES
37
 
#define NEED_EVENTS
38
36
#include "Xlibint.h"
39
37
#include "XKBlibint.h"
40
38
#include <X11/extensions/XKBgeom.h>
45
43
 
46
44
#include <stdio.h>
47
45
#include <X11/X.h>
48
 
#define NEED_EVENTS
49
 
#define NEED_REPLIES
50
46
#include <X11/Xproto.h>
51
47
#include "misc.h"
52
48
#include "inputstr.h"