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

[pciutils.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8165ee6952c357eb3faac143b5584821beef5672..35cb5db97d251d4f895adcc6c7ed7f8d537f1887 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
@@ -142,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.