Merge branch 'upstream' into tizen

Conflicts:
	AUTHORS
	COPYING
	ChangeLog
	INSTALL
	Makefile.am
	Makefile.in
	README
	README.windows.txt
	TODO
	config.rpath
	configure.ac
	doc/Doxyfile.in
	doc/Makefile.am
	doc/Makefile.in
	doc/examples.h
	doc/mainpage.h
	examples/Makefile.am
	examples/Makefile.in
	examples/albumart.c
	examples/albums.c
	examples/common.h
	examples/connect.c
	examples/connect.h
	examples/delfile.c
	examples/detect.c
	examples/emptyfolders.c
	examples/files.c
	examples/filetree.c
	examples/folders.c
	examples/format.c
	examples/getfile.c
	examples/getplaylist.c
	examples/newfolder.c
	examples/newplaylist.c
	examples/pathutils.c
	examples/pathutils.h
	examples/playlists.c
	examples/reset.c
	examples/sendfile.c
	examples/sendtr.c
	examples/thumb.c
	examples/tracks.c
	examples/trexist.c
	examples/util.c
	examples/util.h
	libmtp.pc
	libmtp.pc.in
	libmtp.sh
	libmtp.sh.in
	m4/byteorder.m4
	m4/iconv.m4
	m4/stdint.m4
	src/Makefile.am
	src/README
	src/_stdint.h
	src/chdk_live_view.h
	src/chdk_ptp.h
	src/device-flags.h
	src/gphoto2-endian.h
	src/libmtp.c
	src/libmtp.h
	src/libmtp.h.in
	src/libmtp.sym
	src/libopenusb1-glue.c
	src/libusb-glue.c
	src/libusb-glue.h
	src/libusb1-glue.c
	src/mtpz.c
	src/mtpz.h
	src/playlist-spl.c
	src/playlist-spl.h
	src/ptp-pack.c
	src/ptp.c
	src/ptp.h
	src/unicode.c
	src/unicode.h
	src/util.c
	src/util.h
	util/Makefile.am
	util/Makefile.in
	util/mtp-hotplug.c
	util/mtp-probe.c

Change-Id: I412b7e209ad6ba836c3ec00ba76501625fd927fc

2 files changed, 56 insertions, 56 deletions

diff --git a/COPYING b/COPYING
index 213a1ab..9eed3e8 100755
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
- Copyright © 1991, 1999 Free Software Foundation, Inc.
+ Copyright © 1991, 1999 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -471,7 +471,7 @@ convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the library's name and a brief idea of what it does.>
-    Copyright © <year>  <name of author>
+    Copyright © <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/README.windows.txt b/README.windows.txt
index d360806..81cc1d1 100755
--- a/README.windows.txt
+++ b/README.windows.txt
@@ -1,54 +1,54 @@
-This file was created by James Ravenscroft <ravenscroftj@gmail.com> as a direct revision of Farooq Zaman's work with LibMTP on Windows.

-

- CHANGELOG

-----------------

-14th January 2009: Created the first revision of this file taking information from the work of Farooq Zaman.

-

- 1.0 Compilation of LibMTP on Windows 2000/XP/NT 

------------------------------------------------------------

-LibMTP currently compiles under Windows using MingW/MSys. The source relies upon the __WIN32__ macro which is defined by MinGW by default.

-

-Libraries:

-LibMTP currently depends on LibUSB and libiconv. There are currently projects that port both of these libraries to Windows. Binary files can be

-obtained from:

-

-LibUSB Win32 - http://libusb-win32.sourceforge.net/

-

-LibIconv - http://gnuwin32.sourceforge.net/packages/libiconv.htm

-

-With both of these libraries extracted and placed in MinGW's search path, you can compile the library by opening the Msys prompt, navigating to

-the path where the extracted LibMTP source files can be found and typing:

-

-./configure

-make all

-make install

-

-

-

- 2.0 LibUSB and Driver Issues for Windows

-----------------------------------------------

-

-Unfortunately, Windows does not have abstract USB support and depends upon specific drivers for each and every device you use. Fortunately, 

-LibUSB-Win32 provide a solution to this problem. LibMTP takes advantage of the LibUSB-Win32 Device Driver package.

-

-1. Download the latest device driver binary package (libusb-win32-device-bin-x.x.x.x.tar.gz) from http://sourceforge.net/project/showfiles.php?group_id=78138

-2. Upon extraction, plug in your music device and run bin/inf-wizard.exe. Selecting your device and saving the inf file in the project root directory.

-3. Copy the files "bin/libusb0.dll" and "libusb0.sys" or "libusb0_x64.dll" and "libusb0_x64.sys" for 32-bit or 64-bit operating systems respectively.

-4. Goto Start -> Run, type "devmgmt.msc" and press "ok".

-5. Select your music device from the list and click Action -> Update Driver, Choose "No, not this time" if prompted to connect to microsoft.

-6. Choose "Install from a list or specific location".

-7.  Choose "Don't search, I will choose the driver to install

-8. Click the "Have Disk..." button in the bottom right corner of the prompt

-9. Browse to your .inf file and select it. Press Ok 

-10. The name of your music device should appear in the prompt, click it and click "Next>" (Ignore any prompts about Driver Signing, continuing 

-installation of the selected driver).

-11. Click finish to end the driver install process.

-

-To get your old driver back:

-

-1. Goto Start -> Run, type "devmgmt.msc" and press "ok".

-2. Select your music device, right click on it and click "Properties"

-3. Go to the "Driver" pane and select "Roll Back Driver".

-

- 3.0 

-----------------------------------------------

+This file was created by James Ravenscroft <ravenscroftj@gmail.com> as a direct revision of Farooq Zaman's work with LibMTP on Windows.
+
+ CHANGELOG
+----------------
+14th January 2009: Created the first revision of this file taking information from the work of Farooq Zaman.
+
+ 1.0 Compilation of LibMTP on Windows 2000/XP/NT 
+-----------------------------------------------------------
+LibMTP currently compiles under Windows using MingW/MSys. The source relies upon the __WIN32__ macro which is defined by MinGW by default.
+
+Libraries:
+LibMTP currently depends on LibUSB and libiconv. There are currently projects that port both of these libraries to Windows. Binary files can be
+obtained from:
+
+LibUSB Win32 - http://libusb-win32.sourceforge.net/
+
+LibIconv - http://gnuwin32.sourceforge.net/packages/libiconv.htm
+
+With both of these libraries extracted and placed in MinGW's search path, you can compile the library by opening the Msys prompt, navigating to
+the path where the extracted LibMTP source files can be found and typing:
+
+./configure
+make all
+make install
+
+
+
+ 2.0 LibUSB and Driver Issues for Windows
+----------------------------------------------
+
+Unfortunately, Windows does not have abstract USB support and depends upon specific drivers for each and every device you use. Fortunately, 
+LibUSB-Win32 provide a solution to this problem. LibMTP takes advantage of the LibUSB-Win32 Device Driver package.
+
+1. Download the latest device driver binary package (libusb-win32-device-bin-x.x.x.x.tar.gz) from http://sourceforge.net/project/showfiles.php?group_id=78138
+2. Upon extraction, plug in your music device and run bin/inf-wizard.exe. Selecting your device and saving the inf file in the project root directory.
+3. Copy the files "bin/libusb0.dll" and "libusb0.sys" or "libusb0_x64.dll" and "libusb0_x64.sys" for 32-bit or 64-bit operating systems respectively.
+4. Goto Start -> Run, type "devmgmt.msc" and press "ok".
+5. Select your music device from the list and click Action -> Update Driver, Choose "No, not this time" if prompted to connect to microsoft.
+6. Choose "Install from a list or specific location".
+7.  Choose "Don't search, I will choose the driver to install
+8. Click the "Have Disk..." button in the bottom right corner of the prompt
+9. Browse to your .inf file and select it. Press Ok 
+10. The name of your music device should appear in the prompt, click it and click "Next>" (Ignore any prompts about Driver Signing, continuing 
+installation of the selected driver).
+11. Click finish to end the driver install process.
+
+To get your old driver back:
+
+1. Goto Start -> Run, type "devmgmt.msc" and press "ok".
+2. Select your music device, right click on it and click "Properties"
+3. Go to the "Driver" pane and select "Roll Back Driver".
+
+ 3.0 
+----------------------------------------------