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 /debian/python-dmidecode-dbg.docs | |
| 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 'debian/python-dmidecode-dbg.docs')
| -rw-r--r-- | debian/python-dmidecode-dbg.docs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/python-dmidecode-dbg.docs b/debian/python-dmidecode-dbg.docs index 5ac33e9..a2456eb 100644 --- a/debian/python-dmidecode-dbg.docs +++ b/debian/python-dmidecode-dbg.docs @@ -1,2 +1,6 @@ README +doc/AUTHORS doc/changelog +doc/README.types +doc/AUTHORS.upstream +doc/README.upstream |