Merge remote-tracking branch 'dava/development' into DDevelopment
Merge remote-tracking branch 'dava/development' into DDevelopment
Merge remote-tracking branch 'dava/development' into DDevelopment
[DF-185] Fix MacOS ResourceEditor project
Merge branch 'development' of https://github.com/dava/dava.framework into development
merge
[DF-1129]
[DF-1130]
[DF-993]
fixed.
[DF-962] remove isInitiatedByUser flag, add platform specific check
Merge remote-tracking branch 'dava/development' into DDevelopment
[DF-1136] fix angle web dropping in win
[DF-1136] fix line endings to unix type
Merge branch 'Android' of https://github.com/adebt/dava.framework into android
[DF-1029] fix native text edit for android.
Merge branch 'Android' of https://github.com/adebt/dava.framework into development
Merge branch 'DF-1136_Droping_angle_web_in_heightmapEditor' of https://github.com/adebt/dava.framework into angles
Merge branch 'DAVA/development'
[DF-1029] fix native text edit for android 2.3
teamcity fix
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge pull request #199 from adebt/development

Fixes of compilation warnings for Framework & UI Editor.