Merge branch 'master' of git://github.com/awakecoding/FreeRDP

Conflicts:
	include/freerdp/client.h

diff --cc client/common/client.c
Simple merge

diff --cc client/common/file.c
Simple merge

diff --cc include/freerdp/client.h
index 60ada27,d76a322..661f3ba
--- 1/include/freerdp/client.h
--- 2/include/freerdp/client.h
+++ b/include/freerdp/client.h
@@@ -87,8 -87,8 +87,8 @@@ FREERDP_API HANDLE freerdp_client_get_t
  
  FREERDP_API int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, char** argv);
  FREERDP_API int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename);
 -FREERDP_API int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, BYTE* buffer, size_t size);
 +FREERDP_API int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, const BYTE* buffer, size_t size);
- FREERDP_API int freerdp_client_settings_write_connection_file(rdpSettings* settings, const char* filename, BOOL unicode);
+ FREERDP_API int freerdp_client_settings_write_connection_file(const rdpSettings* settings, const char* filename, BOOL unicode);
  
  #ifdef __cplusplus
  }

diff --cc include/freerdp/client/file.h
index 8268f28,4f31530..e9f6d33
--- 1/include/freerdp/client/file.h
--- 2/include/freerdp/client/file.h
+++ b/include/freerdp/client/file.h
@@@ -142,12 -142,12 +142,12 @@@ extern "C" 
  #endif
  
  FREERDP_API BOOL freerdp_client_parse_rdp_file(rdpFile* file, const char* name);
 -FREERDP_API BOOL freerdp_client_parse_rdp_file_buffer(rdpFile* file, BYTE* buffer, size_t size);
 +FREERDP_API BOOL freerdp_client_parse_rdp_file_buffer(rdpFile* file, const BYTE* buffer, size_t size);
  FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings* settings);
  
- FREERDP_API BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, rdpSettings* settings);
- FREERDP_API BOOL freerdp_client_write_rdp_file(rdpFile* file, const char* name, BOOL unicode);
- FREERDP_API size_t freerdp_client_write_rdp_file_buffer(rdpFile* file, char* buffer, size_t size);
+ FREERDP_API BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSettings* settings);
+ FREERDP_API BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL unicode);
+ FREERDP_API size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, size_t size);
  
  FREERDP_API rdpFile* freerdp_client_rdp_file_new(void);
  FREERDP_API void freerdp_client_rdp_file_free(rdpFile* file);