[ohm] ohm: Branch 'master'

[Richard Hughes]

 intltool-extract.in                 |    1 -
 intltool-merge.in                   |    1 -
 intltool-update.in                  |    1 -
 plugins/glue/dpms/ohm-plugin-dpms.c |    1 -
 4 files changed, 4 deletions(-)

New commits:
commit 3cb3496846508929b9f2d05683ec93523de7947c
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Feb 11 17:19:27 2010 +0000

    Fix build

diff --git a/intltool-extract.in b/intltool-extract.in
deleted file mode 120000
index 340fc8d..0000000
--- a/intltool-extract.in
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/intltool/intltool-extract.in
\ No newline at end of file
diff --git a/intltool-merge.in b/intltool-merge.in
deleted file mode 120000
index 2238bbd..0000000
--- a/intltool-merge.in
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/intltool/intltool-merge.in
\ No newline at end of file
diff --git a/intltool-update.in b/intltool-update.in
deleted file mode 120000
index 0b1800f..0000000
--- a/intltool-update.in
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/intltool/intltool-update.in
\ No newline at end of file
diff --git a/plugins/glue/dpms/ohm-plugin-dpms.c b/plugins/glue/dpms/ohm-plugin-dpms.c
index d23f311..70ea7a6 100644
--- a/plugins/glue/dpms/ohm-plugin-dpms.c
+++ b/plugins/glue/dpms/ohm-plugin-dpms.c
@@ -31,7 +31,6 @@
 #include <X11/Xproto.h>			/* for CARD16 */
 #include <X11/extensions/dpms.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/dpmsstr.h>
 
 static Display *dpy;