Merge branch 'pointer-as-path'
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Sun, 5 Jun 2011 18:56:59 +0000 (11:56 -0700)
committerFrederik Gladhorn <frederik.gladhorn@nokia.com>
Sun, 5 Jun 2011 18:56:59 +0000 (11:56 -0700)
commit8dc92f3a9368bbe6677b997a18eb5c735e72252c
tree303333baee29aeeb30413c3d8d746a440c016b19
parentbec09069925cd103e462aeb3ff29887fd867c20e
parentc4fa6cc974522248220d2aeb1c7b4612f81af895
Merge branch 'pointer-as-path'
src/adaptor.cpp