Merge branch 'master' into interface_cleanup
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 16 Mar 2016 12:56:49 +0000 (13:56 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 16 Mar 2016 12:56:49 +0000 (13:56 +0100)
commit0b8b4279646824ac1ccbe91c4b870ee5cca6bcf6
treedaf6341519fdadf0768ac65686a77a8fd2fd1638
parent5a053a5e621b27ae8b7f8ed63cb421dc3a45bb40
parent9c63701281b437204b085f8b5428c25661414509
Merge branch 'master' into interface_cleanup
src-plugins/subsystems/os_linux/os_fd_linux.h