← Back to branch summary

~smspillaz/compiz-core/compiz-core.fix_898469

« back to all changes in this revision

Viewing changes to plugins/annotate/src/annotate.h

Merged compiz-core.fix_898465 into compiz-core.fix_898469.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/annotate/src/annotate.h
23
23
 * Author: David Reveman <davidr@novell.com>
24
24
 */
25
25
 
26
 
#include <cmath>
 
26
#include "annotate_options.h"
 
27
#include <composite/composite.h>
 
28
 
 
29
#include <core/serialization.h>
 
30
 
27
31
#include <cairo-xlib-xrender.h>
28
 
 
29
 
#include <core/core.h>
30
 
#include <core/serialization.h>
31
32
#include <opengl/opengl.h>
32
 
#include <composite/composite.h>
33
33
 
34
 
#include "annotate_options.h"
 
34
#include <cmath>
35
35
 
36
36
static int annoLastPointerX = 0;
37
37
static int annoLastPointerY = 0;