diff options
| author | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
| commit | eb08fd406370a81172d7fdd0663233a5f140b784 (patch) | |
| tree | c50e19f2b873441672b20a7e339c176d9a4a7cbf /doc/AUTHORS | |
| parent | 39cbdfb56e80cabbd67754d8d77f781e14eaa3da (diff) | |
| parent | 3165a97a06f891622b913714bc4f8ca54565f9cc (diff) | |
| download | python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.gz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.xz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.zip | |
Merge commit 'nima/xml'
Conflicts:
debian/changelog
Had the same changelog entry in both xml and master
branch, with a minor wording difference. Removed the
duplicate and merged in the changelog entries from the
XML branch
src/dmidecode.c
Merge process got confused by some functions which was not
changed. Removed the code coming from the master branch and
let the XML be the base.
src/setup-dbg.py
src/setup.py
In the XML branch, the version of the python-dmidecode is
now a function which retrieves the version number from
src/version.h. Merged in this feature to master as well.
Diffstat (limited to 'doc/AUTHORS')
| -rw-r--r-- | doc/AUTHORS | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/doc/AUTHORS b/doc/AUTHORS index 05475b7..b061b5d 100644 --- a/doc/AUTHORS +++ b/doc/AUTHORS @@ -1,15 +1,21 @@ DEVELOPER AND MAINTAINER OF PYTHON MODULE (http://projects.autonomy.net.au/dmidecode) -Nima Talebi <nima@it.net.au> + Nima Talebi <nima@it.net.au> + David Sommerseth <davids@redhat.com> DEVELOPER AND MAINTAINER OF DMIDECODE (Please see http://www.nongnu.org/dmidecode) -Jean Delvare <khali@linux-fr.org> + Jean Delvare <khali@linux-fr.org> ORIGINAL AUTHOR -Alan Cox <alan@redhat.com> + Alan Cox <alan@redhat.com> -MANY THANKS TO (IN CHRONOLOGICAL ORDER) -Jean Delvare <khali@linux-fr.org> -Stephen Darragh <srd@it.net.au> -Joel Heenan <joel.heenan@det.nsw.edu.au> -Vaughan Whitteron <vaughan.whitteron@det.nsw.edu.au> -Justin Cook +MANY THANKS TO (IN REVERSE CHRONOLOGICAL ORDER) + Richard Fontana + Daniel Veillard + David Sommerseth <davids@redhat.com> + Clark Williams <williams@redhat.com> + Christoph Haas <haas@debian.org> + Jean Delvare <khali@linux-fr.org> + Vaughan Whitteron <vaughan.whitteron@det.nsw.edu.au> + Joel Heenan <joel.heenan@det.nsw.edu.au> + Stephen Darragh <srd@it.net.au> + Justin Cook |