Merge branch 'stable' into dual_socket
authorHenning Rogge <hrogge@googlemail.com>
Sun, 13 Dec 2009 14:01:24 +0000 (15:01 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sun, 13 Dec 2009 14:01:24 +0000 (15:01 +0100)
commit79d847edd02709e5d54cbf9859f47c42b76e7a77
treefd60c69813ca2aeb2f79624f08aa0c5e4bcdb4c1
parent8d9167b008dca8076db357fd57f4c8eca4f4ab64
parent1ee8dabc6fb1f37bfae2014e023858295c158bb8
Merge branch 'stable' into dual_socket
src/interfaces.h
src/main.c