Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
ec5bd2
Merge pull request #2619 from manongjohn/fix_version_control
25 files
Merged by Rodney
6 years ago
, Committed by GitHub
6 years ago
,
raw
patch
tree
parents
7ea125bdb38bef168d8c6871363bfffce3b60d59
825aea606b115d8f036deeb14101742308198136
25 files changed.
231 lines added
.
7723 lines removed
.
stuff/config/qss/Blue/Blue.qss
file modified
+1
-1905
stuff/config/qss/Dark/Dark.qss
file modified
+1
-1905
stuff/config/qss/Default/Default.qss
file modified
+1
-1905
stuff/config/qss/Default/less/layouts/controls.less
file modified
+2
-1
stuff/config/qss/Light/Light.qss
file modified
+1
-1906
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+2
-0
toonz/sources/tnztools/tool.cpp
file modified
+4
-10
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+19
-17
toonz/sources/toonz/dvitemview.cpp
file modified
+8
-5
toonz/sources/toonz/filebrowser.cpp
file modified
+4
-0
toonz/sources/toonz/filmstrip.cpp
file modified
+1
-7
toonz/sources/toonz/svncommitdialog.cpp
file modified
+14
-5
toonz/sources/toonz/svndeletedialog.cpp
file modified
+12
-1
toonz/sources/toonz/svnlockdialog.cpp
file modified
+15
-13
toonz/sources/toonz/svnlockframerangedialog.cpp
file modified
+20
-6
toonz/sources/toonz/svnrevertdialog.cpp
file modified
+6
-1
toonz/sources/toonz/svnupdateandlockdialog.cpp
file modified
+2
-0
toonz/sources/toonz/svnupdatedialog.cpp
file modified
+2
-0
toonz/sources/toonz/versioncontrol.cpp
file modified
+30
-4
toonz/sources/toonz/versioncontroltimeline.cpp
file modified
+26
-25
toonz/sources/toonzlib/studiopalette.cpp
file modified
+7
-0
toonz/sources/toonzlib/tproject.cpp
file modified
+9
-1
toonz/sources/toonzlib/txshpalettelevel.cpp
file modified
+5
-0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+29
-4
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+10
-2
Merge pull request #2619 from manongjohn/fix_version_control Fix version control issues
stuff/config/qss/Blue/Blue.qss
file modified
+1
-1905
stuff/config/qss/Dark/Dark.qss
file modified
+1
-1905
stuff/config/qss/Default/Default.qss
file modified
+1
-1905
stuff/config/qss/Default/less/layouts/controls.less
file modified
+2
-1
stuff/config/qss/Light/Light.qss
file modified
+1
-1906
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+2
-0
toonz/sources/tnztools/tool.cpp
file modified
+4
-10
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+19
-17
toonz/sources/toonz/dvitemview.cpp
file modified
+8
-5
toonz/sources/toonz/filebrowser.cpp
file modified
+4
-0
toonz/sources/toonz/filmstrip.cpp
file modified
+1
-7
toonz/sources/toonz/svncommitdialog.cpp
file modified
+14
-5
toonz/sources/toonz/svndeletedialog.cpp
file modified
+12
-1
toonz/sources/toonz/svnlockdialog.cpp
file modified
+15
-13
toonz/sources/toonz/svnlockframerangedialog.cpp
file modified
+20
-6
toonz/sources/toonz/svnrevertdialog.cpp
file modified
+6
-1
toonz/sources/toonz/svnupdateandlockdialog.cpp
file modified
+2
-0
toonz/sources/toonz/svnupdatedialog.cpp
file modified
+2
-0
toonz/sources/toonz/versioncontrol.cpp
file modified
+30
-4
toonz/sources/toonz/versioncontroltimeline.cpp
file modified
+26
-25
toonz/sources/toonzlib/studiopalette.cpp
file modified
+7
-0
toonz/sources/toonzlib/tproject.cpp
file modified
+9
-1
toonz/sources/toonzlib/txshpalettelevel.cpp
file modified
+5
-0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+29
-4
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+10
-2