~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/scale/src/scale.cpp

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
#define EDGE_STATE (CompAction::StateInitEdge)
40
40
 
41
41
class ScalePluginVTable :
42
 
    public CompPlugin::VTableForScreenAndWindow<ScaleScreen, ScaleWindow>
 
42
    public CompPlugin::VTableForScreenAndWindow<ScaleScreen, ScaleWindow, COMPIZ_SCALE_ABI>
43
43
{
44
44
    public:
45
45