← Back to branch summary

~muktupavels/metacity/lp1403583

« back to all changes in this revision

Viewing changes to src/core/atomnames.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/atomnames.h
1
1
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
2
2
 
3
 
/* 
 
3
/*
4
4
 * Copyright (C) 2001 Havoc Pennington
5
5
 * Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
6
6
 * Copyright (C) 2003, 2004 Rob Adams
7
7
 * Copyright (C) 2004-2006 Elijah Newren
8
8
 * Copyright (C) 2008 Thomas Thurman
9
 
 * 
 
9
 *
10
10
 * This program is free software; you can redistribute it and/or
11
11
 * modify it under the terms of the GNU General Public License as
12
12
 * published by the Free Software Foundation; either version 2 of the
16
16
 * WITHOUT ANY WARRANTY; without even the implied warranty of
17
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
18
18
 * General Public License for more details.
19
 
 * 
 
19
 *
20
20
 * You should have received a copy of the GNU General Public License
21
21
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
22
22
 */
52
52
item(UTF8_STRING)
53
53
item(WM_ICON_SIZE)
54
54
item(_KWM_WIN_ICON)
55
 
item(_METACITY_RESTART_MESSAGE)    
 
55
item(_METACITY_RESTART_MESSAGE)
56
56
item(_METACITY_RELOAD_THEME_MESSAGE)
57
57
item(_METACITY_SET_KEYBINDINGS_MESSAGE)
58
58
item(_METACITY_SET_MOUSEMODS_MESSAGE)
59
59
item(_METACITY_TOGGLE_VERBOSE)
 
60
item(_GTK_THEME_VARIANT)
 
61
item(_GTK_FRAME_EXTENTS)
60
62
item(_GNOME_PANEL_ACTION)
61
63
item(_GNOME_PANEL_ACTION_MAIN_MENU)
62
64
item(_GNOME_PANEL_ACTION_RUN_DIALOG)