Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
98ad89
Merge remote-tracking branch 'origin/master' into stageinch2
Merged and Committed by shun_iwasawa
9 years ago
raw
patch
tree
parents
bb0d83547aa99fb4ce3e2240b9e6def2c477a6af
9c70ac1a010d262450dda79cf1380134818363fe
26 files changed.
140 lines added
.
55 lines removed
.
ci-scripts/osx/travis-build.sh
file modified
+4
-0
ci-scripts/osx/travis-install.sh
file modified
+2
-0
stuff/projects/cleanupreslist.txt
file modified
+10
-6
stuff/projects/reslist.txt
file modified
+8
-6
toonz/sources/beautification.bat
file removed
-5
toonz/sources/beautification.sh
file modified
+1
-1
toonz/sources/common/trop/tblur.cpp
file modified
+1
-1
toonz/sources/common/twain/twain.h
file modified
+9
-17
toonz/sources/include/tfx.h
file modified
+0
-1
toonz/sources/include/toonz/preferences.h
file modified
+3
-2
toonz/sources/include/toonzqt/lineedit.h
file modified
+1
-0
toonz/sources/include/tpersist.h
file modified
+1
-2
toonz/sources/include/trenderresourcemanager.h
file modified
+1
-2
toonz/sources/include/tsmartpointer.h
file modified
+1
-2
toonz/sources/stdfx/stdfx.h
file modified
+0
-1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+24
-0
toonz/sources/toonz/comboviewerpane.h
file modified
+2
-1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+12
-1
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+3
-1
toonz/sources/toonz/preferencespopup.cpp
file modified
+16
-3
toonz/sources/toonz/preferencespopup.h
file modified
+2
-1
toonz/sources/toonz/projectpopup.cpp
file modified
+2
-1
toonz/sources/toonz/viewerpane.cpp
file modified
+25
-0
toonz/sources/toonz/viewerpane.h
file modified
+2
-1
toonz/sources/toonzlib/preferences.cpp
file modified
+9
-0
toonz/sources/toonzqt/lineedit.cpp
file modified
+1
-0
Merge remote-tracking branch 'origin/master' into stageinch2
ci-scripts/osx/travis-build.sh
file modified
+4
-0
ci-scripts/osx/travis-install.sh
file modified
+2
-0
stuff/projects/cleanupreslist.txt
file modified
+10
-6
stuff/projects/reslist.txt
file modified
+8
-6
toonz/sources/beautification.bat
file removed
-5
toonz/sources/beautification.sh
file modified
+1
-1
toonz/sources/common/trop/tblur.cpp
file modified
+1
-1
toonz/sources/common/twain/twain.h
file modified
+9
-17
toonz/sources/include/tfx.h
file modified
+0
-1
toonz/sources/include/toonz/preferences.h
file modified
+3
-2
toonz/sources/include/toonzqt/lineedit.h
file modified
+1
-0
toonz/sources/include/tpersist.h
file modified
+1
-2
toonz/sources/include/trenderresourcemanager.h
file modified
+1
-2
toonz/sources/include/tsmartpointer.h
file modified
+1
-2
toonz/sources/stdfx/stdfx.h
file modified
+0
-1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+24
-0
toonz/sources/toonz/comboviewerpane.h
file modified
+2
-1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+12
-1
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+3
-1
toonz/sources/toonz/preferencespopup.cpp
file modified
+16
-3
toonz/sources/toonz/preferencespopup.h
file modified
+2
-1
toonz/sources/toonz/projectpopup.cpp
file modified
+2
-1
toonz/sources/toonz/viewerpane.cpp
file modified
+25
-0
toonz/sources/toonz/viewerpane.h
file modified
+2
-1
toonz/sources/toonzlib/preferences.cpp
file modified
+9
-0
toonz/sources/toonzqt/lineedit.cpp
file modified
+1
-0