fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-05 18:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: fix conflicts

Browse source
This commit is contained in:
Richard Hughes 2009-03-04 13:12:10 +00:00
commit 57c13c7494
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -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

2
configure.ac
View file

@ -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