]> mj.ucw.cz Git - paperjam.git/commit
Implemented merge
authorMartin Mares <mj@ucw.cz>
Tue, 3 Apr 2018 18:18:01 +0000 (20:18 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 3 Apr 2018 18:18:01 +0000 (20:18 +0200)
commit65a19b7c5297c12b66fc870e01e5c6ac7bf734fc
treef3abccdb1ed9e2a87b4c5889c4cb743c2116dfcb
parent50b49b5bf24f448fbcbac99099ef9bad72f89beb
Implemented merge
cmds.cc
jam.h
paperjam.cc
pdf-tools.cc
pdf-tools.h