manual merge 3a6645a

Merge commit '3a6645a'
tree: 128863e59236a2ed414cfc646dd5657ed783499a
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE