[chronojump/chronojump-importer: 8/8] Merge branch 'master' into chronojump-importer

[Carles Pina i Estany <carlespina src gnome org>]

commit 97987b5e8e150842022806856eff79cc41f83a00
Merge: bde7073 6577b29
Author: Carles Pina i Estany <carles pina cat>
Date:   Thu Sep 29 01:40:14 2016 +0200

    Merge branch 'master' into chronojump-importer
    
    Conflicts:
        win32/Makefile.am

 Makefile.am                                        |    4 +-
 ...dia => chronopicConnection-1-6-2-and-older.dia} |  Bin 5250 -> 5250 bytes
 diagrams/classes/chronopicConnection-1-6-3.dia     |  Bin 0 -> 4712 bytes
 howto_compile.txt                                  |    3 +
 src/FTD2XX_NET.cs                                  | 6420 ++++++++++++++++++++
 src/Makefile.am                                    |    3 +
 src/chronopicRegister.cs                           |  238 +
 src/constants.cs                                   |    2 +
 src/gui/chronojump.cs                              |    2 +
 src/sqlite/chronopicRegister.cs                    |  113 +
 src/sqlite/main.cs                                 |   25 +-
 win32/Makefile.am                                  |    5 +
 .../deps/FTD2XX_NET_v1.0.14/FTD2XX_NET.Readme.txt  |   10 +
 win32/deps/FTD2XX_NET_v1.0.14/FTD2XX_NET.XML       | 2237 +++++++
 win32/deps/FTD2XX_NET_v1.0.14/FTD2XX_NET.dll       |  Bin 0 -> 70656 bytes
 .../deps/FTD2XX_NET_v1.0.14/Readme.Chronojump.txt  |    1 +
 16 files changed, 9059 insertions(+), 4 deletions(-)
---
diff --cc win32/Makefile.am
index ba23ecc,91c33bf..b0e2afb
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@@ -1,7 -1,11 +1,12 @@@
  deploy:
        python deploy_win32.py
        cp -r deps/* dist/
+       
+       rm dist/FTD2XX_NET_v1.0.14/Readme.chronojump.txt
+       mv dist/FTD2XX_NET_v1.0.14/* dist/bin
+       rmdir dist/FTD2XX_NET_v1.0.14
+ 
 +      python ../src/chronojump-importer/py2exec_chronojump_importer.py py2exe -d 
"dist/bin/chronojump-importer"
        python ../encoder/setup-pyserial_pyper_windows.py install
        python ../encoder/setup-pyserial_pyper_windows.py py2exe -d "dist/bin/encoder"
        cd ../chronopic-firmware/chronopic-firmwarecord/; python setup.py -d "dist/bin"