Commit Graph

7 Commits

Author SHA1 Message Date
Matthew Stamy 6a578d057c Merge branch 'master' of https://github.com/sylvainpelissier/PyPDF2 into sylvainpelissier-master 2018-03-12 14:19:54 -05:00
Sylvain Pelissier 19a8872010 Testing 2016-01-13 10:52:27 +01:00
Igor Mihaljevic b06ac57a6f Python2/3 compatibility on merging pages with eps img into single page 2015-12-14 23:39:46 +01:00
Rob Oakes 0a7b72d135 Merge branch 'gurulabs2' of http://dev.oak-tree.us/publishing/pypdf2 into roakes/gurulabs
Conflicts:
	.gitignore
	PyPDF2/generic.py
2015-06-04 01:18:57 -04:00
switham 8a0f9968d7 NameObject str __init__, .gitignore 2014-04-21 23:07:23 -04:00
Rob Oakes 1311d78772 Added additional escaped characters to bookmark code
- Improved error output to make it easier to diagnose breakages
2014-03-03 13:43:02 -07:00
Adam Coleman c59a212a4c First commit
Original PyPDF code. Updates should be coming from Noah soon.
2011-12-30 09:04:56 -06:00