Merge remote-tracking branch 'njsf/for-steve' into njsf-dbus
authorNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 16 Jan 2012 02:31:46 +0000 (21:31 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 16 Jan 2012 02:31:46 +0000 (21:31 -0500)
commit3197b6ea8a0ff24ff7e24e468e6eaad5487c3289
tree7bde53b0f4b9f899a719f630d662c18f06f04010
parent3ae1f7deee97eec9d1473922ec91dcba1d5503cb
parent280ebe60c41fedd465fb7fc67da669cfdc6216f1
Merge remote-tracking branch 'njsf/for-steve' into njsf-dbus
configure.ac
modules/Makefile.am
modules/dbus/Makefile.am