From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 3 Jul 2016 08:20:35 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/i9e'
X-Git-Tag: v0.5.6~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=de9ce9690ac6194e8e7eaacd10baf21d827e42a4;hp=de9ce9690ac6194e8e7eaacd10baf21d827e42a4

Merge branch 'refs/heads/t/i9e'

Started on 2016-03-08, cooking for three months.

* refs/heads/t/i9e:
  i9e: Replace assertion with warning.
  i9e: Fix compilation on Ubuntu-12.04.
  i9e: print warning if keyseq can not be mapped.
  i9e: Zero out private pointer on open.
---