← Back to branch summary

~raof/mir/no-ipc-on-compositor-threads

« back to all changes in this revision

Viewing changes to src/include/common/mir/input/xkb_mapper.h

  • Committer: Christopher James Halse Rogers
  • Date: 2017-08-08 03:44:18 UTC
  • mfrom: (4201.13.6 development-branch)
  • Revision ID: christopher.halse.rogers@canonical.com-20170808034418-35601154b8me8qmn
Merge trunk to fix CI build

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/include/common/mir/input/xkb_mapper.h
2
2
 * Copyright © 2013-2016 Canonical Ltd.
3
3
 *
4
4
 * This program is free software: you can redistribute it and/or modify it
5
 
 * under the terms of the GNU Lesser General Public License version 3,
 
5
 * under the terms of the GNU Lesser General Public License version 2 or 3,
6
6
 * as published by the Free Software Foundation.
7
7
 *
8
8
 * This program is distributed in the hope that it will be useful,