Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / model3d-view / model3d-view-impl.cpp
2015-10-28 taeyoonMerge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen 39/50139/3 accepted/tizen/mobile/20151102.112611 accepted/tizen/tv/20151102.112656 accepted/tizen/wearable/20151102.112721 submit/tizen/20151102.084015
2015-10-23 Kimmo HoikkaMerge "Changed ShadowView to use new custom effects...
2015-10-23 Kimmo HoikkaMerge "Fix text and control depth indices to have sane...
2015-10-21 Chu HoangAdded missing calls the base class Control::OnStageConn... 30/49930/1
2015-10-14 Kimmo HoikkaMerge "DGEUF-110: Limit ScrollView to scroll maximum...
2015-10-13 Ferran SoleChanges following "Remove Sampler scene object" 19/49119/6
2015-09-01 taeyoonMerge branch 'devel/master(1.1.1)' into tizen 18/47218/1 accepted/tizen/mobile/20151022.072943 accepted/tizen/tv/20151022.073009 accepted/tizen/wearable/20151022.073028 submit/tizen/20151022.022818 submit/tizen_mobile/20151022.013557 submit/tizen_tv/20151022.055445 submit/tizen_wearable/20151022.055709
2015-08-20 Paul WisbeyMerge "Fixed cursor behavior when no text is set" into...
2015-08-20 David FumanalFix to light animation in model3d-view control 67/46467/2
2015-08-14 Paul WisbeyMerge "New control to load OBJ files" into devel/master
2015-08-12 David FumanalNew control to load OBJ files 88/44288/19