Commit graph

59 commits

Author SHA1 Message Date
Shinya Kitaoka
a85aeb719a Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies
# Conflicts:
#	toonz/sources/include/tfarmtask.h
2016-04-15 14:28:42 +09:00
Shinya Kitaoka
a09dc1b458 Merge pull request #61 from ideasman42/linux-frameserver-sysconf-fix
Linux: Frameserver system memory access
2016-04-15 13:42:46 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
Michał Janiszewski
df394d6939 Move to stringstream
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02:00
Campbell Barton
b696885d9a Fix error with ifdef blocks
noted by @linkmauve
2016-03-29 15:49:16 +11:00
Campbell Barton
1db1c004b9 Linux: frameserver memory fix 2016-03-27 11:17:15 +11:00
kusano
898953fe78 Add an empty directory stuff/toonzfarm, which is necessary for tfarmserver 2016-03-23 20:45:27 +09:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00