Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
7292b3
Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut
Merged and Committed by shun_iwasawa
7 years ago
raw
patch
tree
parents
cede7cbd4792a55e542ca2fe3f31dfb4efb2691f
c21b57cc2f61b208b1af51f17190132e3de5c96e
20 files changed.
161 lines added
.
64 lines removed
.
toonz/sources/CMakeLists.txt
file modified
+1
-1
toonz/sources/include/toonz/Naa2TlvConverter.h
file modified
+2
-1
toonz/sources/include/toonz/tproject.h
file modified
+1
-1
toonz/sources/include/toonzqt/filefield.h
file modified
+3
-1
toonz/sources/include/toonzqt/imageutils.h
file modified
+4
-2
toonz/sources/tnztools/CMakeLists.txt
file modified
+1
-1
toonz/sources/toonz/CMakeLists.txt
file modified
+3
-3
toonz/sources/toonz/convertpopup.cpp
file modified
+36
-7
toonz/sources/toonz/convertpopup.h
file modified
+2
-1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+5
-7
toonz/sources/toonz/viewerpane.cpp
file modified
+57
-20
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+20
-3
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2
-2
toonz/sources/toonzlib/outputproperties.cpp
file modified
+1
-1
toonz/sources/toonzlib/sceneproperties.cpp
file modified
+0
-2
toonz/sources/toonzlib/tproject.cpp
file modified
+5
-3
toonz/sources/toonzqt/filefield.cpp
file modified
+6
-2
toonz/sources/toonzqt/functiontreeviewer.cpp
file modified
+6
-3
toonz/sources/toonzqt/imageutils.cpp
file modified
+4
-3
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+2
-0
Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut
toonz/sources/CMakeLists.txt
file modified
+1
-1
toonz/sources/include/toonz/Naa2TlvConverter.h
file modified
+2
-1
toonz/sources/include/toonz/tproject.h
file modified
+1
-1
toonz/sources/include/toonzqt/filefield.h
file modified
+3
-1
toonz/sources/include/toonzqt/imageutils.h
file modified
+4
-2
toonz/sources/tnztools/CMakeLists.txt
file modified
+1
-1
toonz/sources/toonz/CMakeLists.txt
file modified
+3
-3
toonz/sources/toonz/convertpopup.cpp
file modified
+36
-7
toonz/sources/toonz/convertpopup.h
file modified
+2
-1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+5
-7
toonz/sources/toonz/viewerpane.cpp
file modified
+57
-20
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+20
-3
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2
-2
toonz/sources/toonzlib/outputproperties.cpp
file modified
+1
-1
toonz/sources/toonzlib/sceneproperties.cpp
file modified
+0
-2
toonz/sources/toonzlib/tproject.cpp
file modified
+5
-3
toonz/sources/toonzqt/filefield.cpp
file modified
+6
-2
toonz/sources/toonzqt/functiontreeviewer.cpp
file modified
+6
-3
toonz/sources/toonzqt/imageutils.cpp
file modified
+4
-3
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+2
-0