Merge branch 'eeprom-new'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 20 May 2011 14:10:11 +0000 (16:10 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 20 May 2011 14:10:11 +0000 (16:10 +0200)
commitf276fe667f966ba9e39ec67c64443e91aec479f0
treea53ef5068ee783868365833e8e28d3d671ad1ea4
parentce3940810901906eb00d67fe259d5540a9008630
parentdc09eaa8d384f8c31fe3015d104e5b3bdd8db009
Merge branch 'eeprom-new'

Conflicts:
examples/stream_test.c
CMakeLists.txt
bindings/ftdi.i
ftdipp/ftdi.hpp