Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
af4194
Merge branch 'master' of github.com:opentoonz/opentoonz
Merged and Committed by Adham Zahran
9 years ago
raw
patch
tree
parents
aeebbd6bf49fcd665baa9d8e79901d96a0b43a05
6a3ad64ad961e578acac4db793385a0aac3f6be5
21 files changed.
1003 lines added
.
105 lines removed
.
ci-scripts/osx/travis-build.sh
file modified
+1
-1
stuff/config/cleanupreslist.txt
stuff/projects/cleanupreslist.txt
file renamed
+0
-0
stuff/config/current.txt
file modified
+21
-0
stuff/config/reslist.txt
stuff/projects/reslist.txt
file renamed
+0
-0
stuff/config/safearea.ini
stuff/projects/safearea.ini
file renamed
+0
-0
stuff/profiles/layouts/fxs/STD_iwa_SoapBubbleFx.xml
file added
+33
stuff/profiles/layouts/fxs/fxs.lst
file modified
+2
-1
stuff/projects/.gitkeep
file added
+0
toonz/sources/CMakeLists.txt
file modified
+0
-1
toonz/sources/stdfx/CMakeLists.txt
file modified
+2
-0
toonz/sources/stdfx/iwa_soapbubblefx.cpp
file added
+714
toonz/sources/stdfx/iwa_soapbubblefx.h
file added
+88
toonz/sources/stdfx/iwa_spectrumfx.cpp
file modified
+107
-85
toonz/sources/stdfx/iwa_spectrumfx.h
file modified
+5
-2
toonz/sources/tnzext/CMakeLists.txt
file modified
+13
-4
toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
file modified
+9
-2
toonz/sources/toonz/pane.cpp
file modified
+2
-2
toonz/sources/toonz/viewerdraw.cpp
file modified
+2
-2
toonz/sources/toonzlib/sceneproperties.cpp
file modified
+2
-2
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+1
-2
toonz/sources/toonzqt/tdockwindows.cpp
file modified
+1
-1
Merge branch 'master' of
github.com
:opentoonz/opentoonz
ci-scripts/osx/travis-build.sh
file modified
+1
-1
stuff/config/cleanupreslist.txt
stuff/projects/cleanupreslist.txt
file renamed
file was renamed with no change to the file
stuff/config/current.txt
file modified
+21
-0
stuff/config/reslist.txt
stuff/projects/reslist.txt
file renamed
file was renamed with no change to the file
stuff/config/safearea.ini
stuff/projects/safearea.ini
file renamed
file was renamed with no change to the file
stuff/profiles/layouts/fxs/STD_iwa_SoapBubbleFx.xml
file added
+33
stuff/profiles/layouts/fxs/fxs.lst
file modified
+2
-1
stuff/projects/.gitkeep
file added
+0
empty file added
toonz/sources/CMakeLists.txt
file modified
+0
-1
toonz/sources/stdfx/CMakeLists.txt
file modified
+2
-0
toonz/sources/stdfx/iwa_soapbubblefx.cpp
file added
+714
toonz/sources/stdfx/iwa_soapbubblefx.h
file added
+88
toonz/sources/stdfx/iwa_spectrumfx.cpp
file modified
+107
-85
toonz/sources/stdfx/iwa_spectrumfx.h
file modified
+5
-2
toonz/sources/tnzext/CMakeLists.txt
file modified
+13
-4
toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
file modified
+9
-2
toonz/sources/toonz/pane.cpp
file modified
+2
-2
toonz/sources/toonz/viewerdraw.cpp
file modified
+2
-2
toonz/sources/toonzlib/sceneproperties.cpp
file modified
+2
-2
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+1
-2
toonz/sources/toonzqt/tdockwindows.cpp
file modified
+1
-1