summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2009-03-04 13:12:10 +0000
committerRichard Hughes <richard@hughsie.com>2009-03-04 13:12:10 +0000
commit57c13c74946a1f147a0892fe4d64c34339bb2cca (patch)
treeaa1a05e05fa50f14e494f7309acf4df1df4a60f2
parent9ae0b5c57348473122806e68225b4669d7a54b55 (diff)
parent546ca4456db68c1c35adbb8c915e1ede47653760 (diff)
trivial: fix conflicts
-rw-r--r--.gitignore2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 89913a3..b1d8c15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ intltool-merge.in
intltool-merge
intltool-update.in
intltool-update
-devicekit-power.pc
+*.pc
xmldocs.make
omf.make
gtk-doc.make
diff --git a/configure.ac b/configure.ac
index a3960c3..38fbcc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59c)
-AC_INIT(DeviceKit-power, 003, http://lists.freedesktop.org/mailman/listinfo/devkit-devel)
+AC_INIT(DeviceKit-power, 007, http://lists.freedesktop.org/mailman/listinfo/devkit-devel)
AM_INIT_AUTOMAKE(DeviceKit-power, 007)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE