Merge remote branch 'mob/benny2' into devel
authorChristian Thaeter <ct@pipapo.org>
Sun, 15 Aug 2010 09:01:09 +0000 (11:01 +0200)
committerChristian Thaeter <ct@pipapo.org>
Sun, 15 Aug 2010 09:01:09 +0000 (11:01 +0200)
commitf2babb3991d56df00c24002c5f53b179a77fe9bd
treeb324d72037aa03b53ee245f7a3940c5aa97e1380
parent8df033bb1b17ff9a827af5a5be2ab68cac0a0785
parent2c6a5c6212b716cb3dee5231e3dd8218e47bfc0a
Merge remote branch 'mob/benny2' into devel

* mob/benny2:
  Text moved to nobug.h.
  Description of Source Code Annotations expanded.
  Improvements to text describing macros.
  Language and text improvements. No significant change to content.