git.asbjorn.biz / swftools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20f3958 3bf6a6c)
Merge branch 'master' into startpage startpage
authorAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Tue, 8 Jun 2010 22:43:12 +0000 (22:43 +0000)
committerAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Tue, 8 Jun 2010 22:43:12 +0000 (22:43 +0000)
1  2 
lib/pdf/BitmapOutputDev.cc patch | diff1 | diff2 | blob | history
lib/pdf/xpdf-changes.patch patch | diff1 | diff2 | blob | history

diff --cc lib/pdf/BitmapOutputDev.cc
Simple merge
diff --cc lib/pdf/xpdf-changes.patch
Simple merge
SWF Tools