Merge commit 'd4066a702407352a0648af882c34ea81a404fa2b'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 13:36:16 +0000 (14:36 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 13:36:22 +0000 (14:36 +0100)
commit6b1a0f205868a341cbc0d754d976cadff3ae9aae
treeccd1f8bd1a649aca7d87df97a9fb98f2bc71c42e
parent546bf316cad21dd80daed6a38bb01ad83ebaec27
parentd4066a702407352a0648af882c34ea81a404fa2b
Merge commit 'd4066a702407352a0648af882c34ea81a404fa2b'

This commit is a no-op. Ours is already formatted the same.

* commit 'd4066a702407352a0648af882c34ea81a404fa2b':
  indeo2data: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>