Merge remote-tracking branch 'upstream/master'

resolved conflicts with refactored structure
This commit is contained in:
HW
2013-10-22 17:19:08 +02:00
14 changed files with 74 additions and 19 deletions

View File

@@ -31,5 +31,6 @@ end
require("document/pdfdocument"):register(DocumentRegistry)
require("document/djvudocument"):register(DocumentRegistry)
require("document/credocument"):register(DocumentRegistry)
require("document/picdocument"):register(DocumentRegistry)
return DocumentRegistry