ChronosXYZ/nesca
1
0
Fork 0
mirror of https://github.com/ChronosX88/nesca.git synced 2024-11-23 18:52:19 +00:00
Code Issues Projects Releases Wiki Activity

Fixing merge conflict1

Browse Source
This commit is contained in:
cora48 2015-03-23 11:12:03 +03:00
commit b4c43b696a
7 changed files with 10134 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Connector.cpp
View File

@ -301,7 +301,7 @@ int Connector::nConnect(const char* ip, const int port, std::string *buffer,
if (lpString != NULL) { if (lpString != NULL) {
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY);
curl_easy_setopt(curl, CURLOPT_FTPLISTONLY, TRUE); curl_easy_setopt(curl, CURLOPT_FTPLISTONLY, 1L);
curl_easy_setopt(curl, CURLOPT_USERPWD, lpString->c_str()); curl_easy_setopt(curl, CURLOPT_USERPWD, lpString->c_str());
}; };

1
mainResources.h
View File

@ -2,7 +2,6 @@
#include "base64.h" #include "base64.h"
#include <libssh/libssh.h> #include <libssh/libssh.h>
#include <openssl/ssl.h>
#include <vector> #include <vector>
#include <curl/curl.h> #include <curl/curl.h>
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)

2
nesca.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.2.1, 2015-03-20T15:45:12. --> <!-- Written by QtCreator 3.2.1, 2015-03-23T10:43:12. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

2534
nesca_startModule.cpp.BACKUP.3450.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2537
nesca_startModule.cpp.BASE.3450.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2528
nesca_startModule.cpp.LOCAL.3450.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2533
nesca_startModule.cpp.REMOTE.3450.cpp Normal file
View File

File diff suppressed because it is too large Load Diff