~muktupavels/metacity/adwaita-icon-theme-lp-1414613

« back to all changes in this revision

Viewing changes to src/include/xprops.h

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-08-01 08:55:34 UTC
  • mfrom: (2.3.6 sid)
  • Revision ID: package-import@ubuntu.com-20140801085534-44mq40oafc8e6pq9
Tags: 1:3.12.0-1ubuntu1
* Merge with Debian unstable (LP: #1347992), remaining changes:
  - 05_raise_on_click_for_click_mode.patch:
    + Force raise on click option.
  - 20_do-not-place-windows-over-the-launcher.patch:
    + Do not initially position windows over the launcher.
  - 103_struts_in_the_middle.patch:
    + Add support for struts in the middle of the work area.
  - 104_workarea_union.patch:
    + Make the workarea be the union of available work areas,
      not only one.
  - 22_fix_above_tab_switching.patch:
    + For Above_Tab, don't compare keysym (fixes group switching).
  - Use Ubuntu Desktop team Vcs fields.
* Drop all other patches. Half of them have been applied upstream,
  others were only needed for Unity 2D and are no longer needed.
* debian/metacity-common.links:
  - Show keybindings in Unity control center (LP: #1299784).

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 * General Public License for more details.
17
17
 * 
18
18
 * You should have received a copy of the GNU General Public License
19
 
 * along with this program; if not, write to the Free Software
20
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
21
 
 * 02111-1307, USA.
 
19
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
22
20
 */
23
21
 
24
22
#ifndef META_XPROPS_H