John Preston a133115aa6 Merge branch 'master' into dev ... Conflicts: Telegram/SourceFiles/ui/style.h		2016-04-20 17:25:32 +03:00
..
project.pbxproj	Merge branch 'master' into dev	2016-04-20 17:25:32 +03:00
qt_preprocess.mak	Xcode build now uses codegen_style/numbers. Xcode projects created.	2016-04-19 13:59:59 +03:00