| commit | f946cfaa3a45e4c5752e3930e8383196aae85399 | [log] [tgz] |
|---|---|---|
| author | Thomas Graf <tgr@lsx.localdomain> | Wed Sep 02 23:41:03 2009 +0200 |
| committer | Thomas Graf <tgr@lsx.localdomain> | Wed Sep 02 23:41:03 2009 +0200 |
| tree | 2d5c064f62ce353a4bb387bf244508c3bcd66e53 | |
| parent | 2ead49f0d5873628156e50dfed7da14619a4172d [diff] | |
| parent | a73e5f92c378e96458ae88a3dc07514ee5856987 [diff] |
Merge branch 'master' of git://dev.medozas.de/libnl Conflicts: lib/Makefile src/Makefile