mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1484a7fa94
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-13 (Sat, 13 Aug 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -37,8 +37,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <driver/fontrenderer.h>
|
||||
|
||||
int my_system(const char * cmd);
|
||||
int my_system(int argc, const char *arg, ...); /* argc is number of arguments including command */
|
||||
|
||||
@@ -71,7 +69,7 @@ std::string getFileName(std::string &file);
|
||||
std::string getFileExt(std::string &file);
|
||||
std::string getNowTimeStr(const char* format);
|
||||
std::string trim(std::string &str, const std::string &trimChars = " \n\r\t");
|
||||
std::string cutString(const std::string str, Font *msgFont, const int width);
|
||||
std::string cutString(const std::string str, int msgFont, const int width);
|
||||
std::string strftime(const char *format, const struct tm *tm);
|
||||
std::string strftime(const char *format, time_t when, bool gm = false);
|
||||
time_t toEpoch(std::string &date);
|
||||
|
Reference in New Issue
Block a user