← Back to branch summary

~townsend/unity/fix-dash-page-up-down

« back to all changes in this revision

Viewing changes to plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h
229
229
  void moveNotify(int dx, int dy, bool immediate);
230
230
 
231
231
  bool glDraw(const GLMatrix&,
232
 
#ifdef USE_MODERN_COMPIZ_GL
233
232
              const GLWindowPaintAttrib&,
234
 
#else
235
 
              GLFragment::Attrib&,
236
 
#endif
237
233
              const CompRegion&,
238
234
              unsigned int);
239
235