git://developer.intra2net.com / libftdi / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce39408 dc09eaa)
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)
Conflicts:
examples/stream_test.c

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
bindings/ftdi.i patch | diff1 | diff2 | blob | history
ftdipp/ftdi.hpp patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc bindings/ftdi.i
Simple merge
diff --cc ftdipp/ftdi.hpp
Simple merge
A library to talk to FTDI chips