| |
@@ -937,23 +937,17 @@
|
| |
<packagereq type="default">open-sans-fonts</packagereq>
|
| |
<packagereq type="default">optipng</packagereq>
|
| |
<packagereq type="default">overpass-fonts</packagereq>
|
| |
- <<<<<<< HEAD
|
| |
- <packagereq type="default">pdfshuffler</packagereq>
|
| |
- =======
|
| |
<packagereq type="default">pdfarranger</packagereq>
|
| |
- <packagereq type="default">pdfmod</packagereq>
|
| |
- >>>>>>> upstream/master
|
| |
<packagereq type="default">phatch</packagereq>
|
| |
<packagereq type="default">pitivi</packagereq>
|
| |
<packagereq type="default">redhat-display-fonts</packagereq>
|
| |
<packagereq type="default">redhat-text-fonts</packagereq>
|
| |
<packagereq type="default">scribus</packagereq>
|
| |
<packagereq type="default">shotwell</packagereq>
|
| |
- <packagereq type="default">shutter</packagereq>
|
| |
<packagereq type="default">sparkleshare</packagereq>
|
| |
<packagereq type="default">synfigstudio</packagereq>
|
| |
<packagereq type="default">typetype-molot-fonts</packagereq>
|
| |
- <packagereq type="default">xournal</packagereq>
|
| |
+ <packagereq type="default">xournalpp</packagereq>
|
| |
<packagereq type="optional">calligra-karbon</packagereq>
|
| |
<packagereq type="optional">geeqie</packagereq>
|
| |
<packagereq type="optional">ImageMagick</packagereq>
|
| |