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

[pciutils.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 08365365c8ee30bb38527255fb75f4ebddf6a853..35cb5db97d251d4f895adcc6c7ed7f8d537f1887 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-02-11  Martin Mares <mj@ucw.cz>
+
+       * lib/names.c: Fix displaying of errors reported by zlib.
+       Previously, the buffer containing the error message had
+       been deallocated by gzclose() before the message was printed.
+
+2008-01-07  Martin Mares <mj@ucw.cz>
+
+       * update-pciids.sh: Added quiet mode (-q). Clean up uncompressed
+       files left by previous versions of the pciutils. Patch by Mike
+       Frysinger.
+
+       * update-pciids.man: Mention the -q switch.
+
+2007-11-29  Martin Mares <mj@ucw.cz>
+
+       * lib/dump.c: Squashed compiler warnings about code with
+       no effect (there really were surplus *'s).
+
 2007-11-06  Martin Mares <mj@ucw.cz>
 
        * Released as 2.2.9.
@@ -129,6 +148,7 @@
        * lspci.c (show_express): Added PCI/PCI-X to PCI-Express Bridge type.
        Patch by Mark Glines.
 
+>>>>>>> main
 2007-02-09  Martin Mares  <mj@ucw.cz>
 
        * pci.ids: Updated to the current snapshot of the database.