Merge branch 'Plasma/5.6'

Authored by xuetianweng on Mar 29 2016, 10:44 PM.

Description

Merge branch 'Plasma/5.6'

Merged Changes

CommitAuthorDetailsCommitted
afd38b228960xuetianweng
Avoid dead loop for xcb_poll_for_reply if xcb connection is dead. 
Mar 29 2016