Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 02:16:17 +0000 (04:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 02:16:47 +0000 (04:16 +0200)
commit13aa5757643eb05da27077acdde4a876a6e50d75
tree87e3c08e6648a58a743f58e532bdfdd0f0019b4e
parenta6fa3a476afb29ff3bcc3e5acedc11c2a90e9e03
parent486e3649cef50190105265fc51846e72d908d1bb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xtea: Add Doxy @file and group

See: 50f52a5498ff02c997d16b8181f32b933ce94b6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>