← Back to branch summary

~muktupavels/metacity/lp1403583

« back to all changes in this revision

Viewing changes to src/core/async-getprop.h

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-11-18 18:13:01 UTC
  • mfrom: (2.3.7 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141118181301-omfi79vghwycfal2
Tags: 1:3.14.2-0ubuntu1
* Merge with Debian unstable, remaining changes:
  - 05_raise_on_click_for_click_mode.patch:
    Force raise on click option.
  - 22_fix_above_tab_switching.patch:
    For Above_Tab, don't compare keysym (fixes group switching).
  - debian/metacity-common.links:
    Show keybindings in Unity control center.
  - Use Ubuntu Desktop team Vcs fields.
* Drop all other patches, they were needed only for Unity 2D.
* New upstream bugfix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/async-getprop.h
4
4
 
5
5
/*
6
6
 * Copyright (C) 2002 Havoc Pennington
7
 
 * 
 
7
 *
8
8
 * Permission to use, copy, modify, distribute, and sell this software
9
9
 * and its documentation for any purpose is hereby granted without
10
10
 * fee, provided that the above copyright notice appear in all copies
11
11
 * and that both that copyright notice and this permission notice
12
12
 * appear in supporting documentation.
13
 
 * 
 
13
 *
14
14
 * The above copyright notice and this permission notice shall be
15
15
 * included in all copies or substantial portions of the Software.
16
 
 * 
 
16
 *
17
17
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18
18
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19
19
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND