]> granicus.if.org Git - libnl/commit
Merge branch 'master' of git://dev.medozas.de/libnl
authorThomas Graf <tgr@lsx.localdomain>
Wed, 2 Sep 2009 21:41:03 +0000 (23:41 +0200)
committerThomas Graf <tgr@lsx.localdomain>
Wed, 2 Sep 2009 21:41:03 +0000 (23:41 +0200)
commitf946cfaa3a45e4c5752e3930e8383196aae85399
tree2d5c064f62ce353a4bb387bf244508c3bcd66e53
parent2ead49f0d5873628156e50dfed7da14619a4172d
parenta73e5f92c378e96458ae88a3dc07514ee5856987
Merge branch 'master' of git://dev.medozas.de/libnl

Conflicts:
lib/Makefile
src/Makefile