Commit graph

6 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
fa76aefa90 cosmetic change 2016-04-14 19:36:34 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Campbell Barton
b66df2a0d6 Use strtok_r for Linux
Makes sense to use same logic for OSX and Linux
2016-04-12 02:56:45 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00