bw / opentoonz

Clone
Source Code
GIT

a85aeb Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies

Merged and Committed by Shinya Kitaoka 8 years ago
raw patch tree
fa76aefa907b5b5b36f41c27fb92cdbd866dc0bd a09dc1b458777dbe9f1f75c927ed21165657ed2d
57 files changed. 110 lines added. 62 lines removed.
toonz/sources/common/tcore/tthread.cpp
file modified
+1 -1
toonz/sources/common/tfx/ttzpimagefx.cpp
file modified
+2 -2
toonz/sources/common/tgl/tgl.cpp
file modified
+3 -1
toonz/sources/common/tiio/compatibility/tfile_io.h
file modified
+1 -1
toonz/sources/common/tipc/tipc.cpp
file modified
+3 -0
toonz/sources/common/tsystem/tlogger.cpp
file modified
+1 -1
toonz/sources/common/tsystem/tpluginmanager.cpp
file modified
+3 -1
toonz/sources/common/tsystem/tsystem.cpp
file modified
+14 -14
toonz/sources/common/tsystem/tsystempd.cpp
file modified
+5 -0
toonz/sources/common/ttest/ttest.cpp
file modified
+4 -0
toonz/sources/common/tvrender/ttessellator.cpp
file modified
+1 -1
toonz/sources/common/twain/twain.h
file modified
+5 -0
toonz/sources/image/compatibility/tfile_io.h
file modified
+4 -0
toonz/sources/image/tzl/tiio_tzl.cpp
file modified
+1 -1
toonz/sources/include/tcg/hpp/triangulate.hpp
file modified
+2 -0
toonz/sources/include/tcontenthistory.h
file modified
+2 -2
toonz/sources/include/tconvert.h
file modified
+1 -1
toonz/sources/include/tfarmtask.h
file modified
+1 -1
toonz/sources/include/tmsgcore.h
file modified
+1 -1
toonz/sources/include/tnztypes.h
file modified
+1 -1
toonz/sources/include/toonz/scriptbinding_files.h
file modified
+1 -1
toonz/sources/include/toonz/ttileset.h
file modified
+1 -1
toonz/sources/include/toonzqt/schematicgroupeditor.h
file modified
+1 -1
toonz/sources/include/tpixel.h
file modified
+2 -0
toonz/sources/include/tscanner.h
file modified
+1 -1
toonz/sources/include/tsound_t.h
file modified
+2 -2
toonz/sources/include/tsystem.h
file modified
+1 -1
toonz/sources/include/tthread.h
file modified
+1 -1
toonz/sources/stdfx/igs_motion_blur.cpp
file modified
+1 -0
toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
file modified
+1 -0
toonz/sources/tnzbase/tscanner/tscannerutil.cpp
file modified
+2 -0
toonz/sources/tnzext/plasticdeformer.cpp
file modified
+2 -0
toonz/sources/tnzext/plastichandle.cpp
file modified
+2 -0
toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
file modified
+1 -0
toonz/sources/tnztools/plastictool.cpp
file modified
+1 -1
toonz/sources/toonz/batches.cpp
file modified
+2 -2
toonz/sources/toonz/batches.h
file modified
+2 -2
toonz/sources/toonz/filmstripcommand.cpp
file modified
+1 -1
toonz/sources/toonz/history.h
file modified
+1 -1
toonz/sources/toonz/insertfxpopup.h
file modified
+1 -1
toonz/sources/toonz/matchline.cpp
file modified
+1 -1
toonz/sources/toonz/mergecmapped.cpp
file modified
+1 -1
toonz/sources/toonz/mergecolumns.cpp
file modified
+1 -1
toonz/sources/toonz/scenesettingspopup.cpp
file modified
+1 -1
toonz/sources/toonz/viewerdraw.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+10 -0
toonz/sources/toonzlib/autopos.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBParam.h
file modified
+1 -1
toonz/sources/toonzlib/studiopalettecmd.cpp
file modified
+1 -1
toonz/sources/toonzlib/tlog.cpp
file modified
+1 -1
toonz/sources/toonzlib/trastercentroid.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionviewer.cpp
file modified
+2 -2
toonz/sources/toonzqt/schematicviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+1 -1 
    Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies
    
    # Conflicts:
    #	toonz/sources/include/tfarmtask.h
file modified
+1 -1
file modified
+2 -2
file modified
+3 -1
file modified
+1 -1
file modified
+3 -0
file modified
+1 -1
file modified
+3 -1
file modified
+14 -14
file modified
+5 -0
file modified
+4 -0
file modified
+1 -1
file modified
+5 -0
file modified
+4 -0
file modified
+1 -1
file modified
+2 -0
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+2 -0
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+1 -0
file modified
+1 -0
file modified
+2 -0
file modified
+2 -0
file modified
+2 -0
file modified
+1 -0
file modified
+1 -1
file modified
+2 -2
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+10 -0
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1

Powered by Pagure 5.7.4

SSH Hostkey/Fingerprint | Documentation | About

© 2014-2019 Red Hat, Inc. and others.

Logo by Pavel Lashutin