Gabriel Gazzán 72b5b10529 Merge branch 'master' of https://github.com/opentoonz/opentoonz ... # Conflicts: # toonz/sources/translations/spanish/colorfx.ts # toonz/sources/translations/spanish/tnzcore.ts # toonz/sources/translations/spanish/tnztools.ts # toonz/sources/translations/spanish/toonz.ts # toonz/sources/translations/spanish/toonzlib.ts # toonz/sources/translations/spanish/toonzqt.ts		2016-06-22 22:26:15 -03:00
..
cmake	CMake: typo fix	2016-04-18 04:43:41 +10:00
install	fix "library" and "fxs" folder locations	2016-04-25 18:45:04 +09:00
sources	Merge branch 'master' of https://github.com/opentoonz/opentoonz	2016-06-22 22:26:15 -03:00