From: Martin Mares <mj@ucw.cz>
Date: Tue, 12 Feb 2008 11:40:26 +0000 (+0100)
Subject: Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git
X-Git-Tag: v3.0.0~1^2~32
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=90f8c88626289b0a713abc41759e8bebe6c20ddb;p=pciutils.git

Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

(Merged with the 2.2.10 release.)
---

90f8c88626289b0a713abc41759e8bebe6c20ddb
diff --cc Makefile
index 35bc7a8,921126f..2751587
--- a/Makefile
+++ b/Makefile
@@@ -4,8 -4,8 +4,8 @@@
  OPT=-O2
  CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=2.2.9-net1
 -VERSION=2.2.10
--DATE=2008-02-11
++VERSION=2.2.10-net1
++DATE=2008-02-12
  
  PREFIX=/usr/local
  SBINDIR=$(PREFIX)/sbin