diff options
| author | Albert Astals Cid <aacid@kde.org> | 2013-03-12 20:27:59 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2013-03-12 20:27:59 +0100 |
| commit | 75849a0d7c205c048714b90883695b6bebd2298c (patch) | |
| tree | 147e61d9232715c5d1cc62398199b44b4ef420fe /poppler/Makefile.am | |
| parent | ec7140b3f56b034fbbc53cb8066ba01fe9f60f47 (diff) | |
| parent | 5a51812b7c1457feb8acaa106f43d7d5252b3980 (diff) | |
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
poppler/Stream.h
Diffstat (limited to 'poppler/Makefile.am')
| -rw-r--r-- | poppler/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/poppler/Makefile.am b/poppler/Makefile.am index 86eddff1..1e485124 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -177,7 +177,7 @@ libpoppler_la_LIBADD = \ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 35:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS |