]> git.proxmox.com Git - mirror_smartmontools-debian.git/commit - os_freebsd.cpp
Merge commit 'upstream/5.39.1'
authorGiuseppe Iuculano <iuculano@debian.org>
Thu, 4 Feb 2010 07:10:07 +0000 (08:10 +0100)
committerGiuseppe Iuculano <iuculano@debian.org>
Thu, 4 Feb 2010 07:10:07 +0000 (08:10 +0100)
commitb1873569eaa6cd20afafc5ef20845a718461ea27
tree7248aede6d32c8daf35c514412ece6d1d92f853a
parent043b08a40b0a6649bcd710729b5cd2f04f889dc3
parentf4ebf3d14d1fc0a257b7183a18d1b1505c163361
Merge commit 'upstream/5.39.1'

Conflicts:
Makefile.in
aclocal.m4
configure
examplescripts/Makefile.in