sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Dev' of https://github.com/liranbg/JceManager into Dev

Browse source
This commit is contained in:
Liran BN 2014-10-14 18:03:16 +03:00
commit 99db1941d1
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/connectionstatus.qrc
View file

@ -10,5 +10,6 @@
<file>busy.png</file>
<file>connected.png</file>
<file>disconnected.png</file>
<file>logo.png</file>
</qresource>
</RCC>

BIN
resources/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

2
src/jceConnection/jcesslclient.h
View file

@ -1,7 +1,7 @@
#ifndef JCESSLCLIENT_H
#define JCESSLCLIENT_H
#include <String>
#include <QString>
#include <QSslSocket>
#include <QThread>
#include <QEventLoop>

2
src/jceData/CSV/csv_exporter.cpp
View file

@ -222,7 +222,7 @@ QString CSV_Exporter::makeLine(QString name, QDate *date, int startH, int startM
}
if(room == "")
description = "\"\Good Luck!\n";
description = "\"Good Luck!\n";
description.append("\nCreated with JCE Manager.\"");