John Preston e616c39608 Merge branch 'dev' into player ... Conflicts: Telegram/SourceFiles/application.cpp Telegram/SourceFiles/core/utils.h Telegram/SourceFiles/localstorage.cpp Telegram/SourceFiles/pspecific_mac_p.mm		2016-10-08 12:10:33 +03:00
..
generator.cpp	Version for OS X 10.6-10.7 build from GYP is ready, not tested yet.	2016-08-29 23:24:16 -06:00
generator.h
main.cpp
module.cpp
module.h
options.cpp	New audio player done (without playlist).	2016-09-23 19:04:26 +03:00
options.h
parsed_file.cpp	Version 0.10.9: langs updated, moved shadow icons to separate files.	2016-10-01 15:35:52 +03:00
parsed_file.h
processor.cpp
processor.h
sprite_generator.cpp
sprite_generator.h
structure_types.cpp
structure_types.h	Closed beta 10002002: testin OS X build by GYP.	2016-09-02 01:27:54 -04:00