Merge remote-tracking branch 'origin/v2.1'

2017-05-16 09:32:03 +02:00 · 2017-05-16 09:32:03 +02:00 · e5a770345b
commit e5a770345b
parent 922659d284 34e70394e9
57 changed files with 29 additions and 0 deletions
--- a/client/full/.gitignore
+++ b/client/full/.gitignore
--- a/client/full/.project
+++ b/client/full/.project
--- a/client/full/.pydevproject
+++ b/client/full/.pydevproject
--- a/client/full/linux/.gitignore
+++ b/client/full/linux/.gitignore
--- a/client/full/linux/Makefile
+++ b/client/full/linux/Makefile
--- a/client/full/linux/build-packages.sh
+++ b/client/full/linux/build-packages.sh
--- a/client/full/linux/debian/.gitignore
+++ b/client/full/linux/debian/.gitignore
--- a/client/full/linux/debian/changelog
+++ b/client/full/linux/debian/changelog
--- a/client/full/linux/debian/compat
+++ b/client/full/linux/debian/compat
--- a/client/full/linux/debian/control
+++ b/client/full/linux/debian/control
--- a/client/full/linux/debian/copyright
+++ b/client/full/linux/debian/copyright
--- a/client/full/linux/debian/docs
+++ b/client/full/linux/debian/docs
--- a/client/full/linux/debian/files
+++ b/client/full/linux/debian/files
--- a/client/full/linux/debian/rules
+++ b/client/full/linux/debian/rules
--- a/client/full/linux/debian/udsclient.log
+++ b/client/full/linux/debian/udsclient.log
--- a/client/full/linux/debian/udsclient.postinst
+++ b/client/full/linux/debian/udsclient.postinst
--- a/client/full/linux/debian/udsclient.postrm
+++ b/client/full/linux/debian/udsclient.postrm
--- a/client/full/linux/debian/udsclient.prerm
+++ b/client/full/linux/debian/udsclient.prerm
--- a/client/full/linux/debian/udsclient.templates
+++ b/client/full/linux/debian/udsclient.templates
--- a/client/full/linux/desktop/UDSClient.desktop
+++ b/client/full/linux/desktop/UDSClient.desktop
--- a/client/full/linux/installer.sh
+++ b/client/full/linux/installer.sh
--- a/client/full/linux/readme.txt
+++ b/client/full/linux/readme.txt
--- a/client/full/linux/udsclient-template.spec
+++ b/client/full/linux/udsclient-template.spec
--- a/client/full/src/.gitignore
+++ b/client/full/src/.gitignore
--- a/client/full/src/UDSClient.py
+++ b/client/full/src/UDSClient.py
--- a/client/full/src/UDSResources.qrc
+++ b/client/full/src/UDSResources.qrc
--- a/client/full/src/UDSResources_rc.py
+++ b/client/full/src/UDSResources_rc.py
--- a/client/full/src/UDSWindow.py
+++ b/client/full/src/UDSWindow.py
--- a/client/full/src/UDSWindow.ui
+++ b/client/full/src/UDSWindow.ui
--- a/client/full/src/images/logo-512.png
+++ b/client/full/src/images/logo-512.png
--- a/client/full/src/images/logo-uds-small.png
+++ b/client/full/src/images/logo-uds-small.png
--- a/client/full/src/images/logo-uds.png
+++ b/client/full/src/images/logo-uds.png
--- a/client/full/src/images/uds.ico
+++ b/client/full/src/images/uds.ico
--- a/client/full/src/macosx/uds.icns
+++ b/client/full/src/macosx/uds.icns
--- a/client/full/src/macosx/uds.iconset/icon_128x128.png
+++ b/client/full/src/macosx/uds.iconset/icon_128x128.png
--- a/client/full/src/macosx/uds.iconset/icon_128x128@2x.png
+++ b/client/full/src/macosx/uds.iconset/icon_128x128@2x.png
--- a/client/full/src/macosx/uds.iconset/icon_16x16.png
+++ b/client/full/src/macosx/uds.iconset/icon_16x16.png
--- a/client/full/src/macosx/uds.iconset/icon_16x16@2x.png
+++ b/client/full/src/macosx/uds.iconset/icon_16x16@2x.png
--- a/client/full/src/macosx/uds.iconset/icon_256x256.png
+++ b/client/full/src/macosx/uds.iconset/icon_256x256.png
--- a/client/full/src/macosx/uds.iconset/icon_256x256@2x.png
+++ b/client/full/src/macosx/uds.iconset/icon_256x256@2x.png
--- a/client/full/src/macosx/uds.iconset/icon_32x32.png
+++ b/client/full/src/macosx/uds.iconset/icon_32x32.png
--- a/client/full/src/macosx/uds.iconset/icon_32x32@2x.png
+++ b/client/full/src/macosx/uds.iconset/icon_32x32@2x.png
--- a/client/full/src/macosx/uds.iconset/icon_512x512.png
+++ b/client/full/src/macosx/uds.iconset/icon_512x512.png
--- a/client/full/src/macosx/uds.iconset/icon_512x512@2x.png
+++ b/client/full/src/macosx/uds.iconset/icon_512x512@2x.png
--- a/client/full/src/uds/init.py
+++ b/client/full/src/uds/init.py
--- a/client/full/src/uds/forward.py
+++ b/client/full/src/uds/forward.py
--- a/client/full/src/uds/log.py
+++ b/client/full/src/uds/log.py
--- a/client/full/src/uds/osDetector.py
+++ b/client/full/src/uds/osDetector.py
--- a/client/full/src/uds/rest.py
+++ b/client/full/src/uds/rest.py
--- a/client/full/src/uds/tools.py
+++ b/client/full/src/uds/tools.py
--- a/client/full/src/update.sh
+++ b/client/full/src/update.sh
--- a/client/thin/.project
+++ b/client/thin/.project
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>UDSClient-Thin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
--- a/client/thin/.pydevproject
+++ b/client/thin/.pydevproject
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/${PROJECT_DIR_NAME}/src</path>
+</pydev_pathproperty>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>
--- a/client/thin/src/uds/init.py
+++ b/client/thin/src/uds/init.py
@ -0,0 +1 @@
+../../../src/uds/__init__.py
--- a/client/thin/src/uds/forward.py
+++ b/client/thin/src/uds/forward.py
@ -0,0 +1 @@
+../../../src/uds/forward.py
--- a/client/thin/src/uds/osDetector.py
+++ b/client/thin/src/uds/osDetector.py
@ -0,0 +1 @@
+../../../src/uds/osDetector.py
--- a/client/thin/src/uds/tools.py
+++ b/client/thin/src/uds/tools.py
@ -0,0 +1 @@
+../../../src/uds/tools.py