![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 8 Dec 2009 10:26:37 +0000 (11:26 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 8 Dec 2009 10:26:37 +0000 (11:26 +0100) | ||
| commit | f9d51dc8fabe44f3cd17499713d63b518f0e1853 | |
| tree | b4e6388e97a3e765992c126f3e3175a9f86a8992 | tree | snapshot |
| parent | ca5af2937040553d53be13b5d5e049c6495c6423 | commit | diff |
| parent | 40f9ed6fcb9bd09662798023f6197f32a1dbfc58 | commit | diff |
Merge branch 'st/python'
Conflicts:
README
configure.in
src/owniptc/libiptc.c
src/types.db
Conflicts:
README
configure.in
src/owniptc/libiptc.c
src/types.db
| AUTHORS | diff1 | | diff2 | | blob | history |
| README | diff1 | | diff2 | | blob | history |
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |