| commit | 73b637d46c1b1a62bce1064ded85f2a0ea92d58e | |
| author | Stefan Bühler <stbuehler@web.de> | |
| Fri, 9 Nov 2007 22:52:31 +0000 (9 23:52 +0100) | ||
| committer | Stefan Bühler <stbuehler@web.de> | |
| Fri, 9 Nov 2007 22:52:31 +0000 (9 23:52 +0100) | ||
| tree | e117b1c37ef3d74d024ca1ce9c7c6ecee460959c | treesnapshot (tar.gz zip) |
| parent | 259868550af3cc986b10e315c7342f63770799ef | commitdiff |
| parent | 08e7f25e0e07438bacf75d4991277cad74c705bd | commitdiff |
Merge branch 'master' of git+ssh://d.bahrdt@repo.or.cz/srv/git/nut
Conflicts:
libnut/libnut_wpa_supplicant.h
Conflicts:
libnut/libnut_wpa_supplicant.h