Skip to content

Commit

Permalink
Merge 3ef762b into 6bea325
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Jan 16, 2020
2 parents 6bea325 + 3ef762b commit f41f6e3
Show file tree
Hide file tree
Showing 104 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion res/oxygen/apps/inkscape-logo.png

This file was deleted.

Binary file added res/oxygen/apps/inkscape-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/apps/kcalc.png

This file was deleted.

Binary file added res/oxygen/apps/kcalc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/apps/kwalletmanager2.png

This file was deleted.

Binary file added res/oxygen/apps/kwalletmanager2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/apps/kwrite.png

This file was deleted.

Binary file added res/oxygen/apps/kwrite.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/apps/network-manager.png

This file was deleted.

Binary file added res/oxygen/apps/network-manager.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/apps/spectacle.png

This file was deleted.

Binary file added res/oxygen/apps/spectacle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-atom+xml.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-atom+xml.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-ogg.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-ogg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-pgp.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-pgp.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-flash-video.png

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-iso.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-x-iso.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-jar.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-x-jar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-kdenlivetitle.png

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-raw-disk-image.png

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/application-x-sif.png

This file was deleted.

Binary file added res/oxygen/mimetypes/application-x-sif.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/audio-mp2.png

This file was deleted.

Binary file added res/oxygen/mimetypes/audio-mp2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/audio-mp3.png

This file was deleted.

Binary file added res/oxygen/mimetypes/audio-mp3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/audio-mp4.png

This file was deleted.

Binary file added res/oxygen/mimetypes/audio-mp4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/audio-x-mp2.png

This file was deleted.

Binary file added res/oxygen/mimetypes/audio-x-mp2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/fonts-package.png

This file was deleted.

Binary file added res/oxygen/mimetypes/fonts-package.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-bmp.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-bmp.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-gif.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-gif.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-jpeg.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-jpeg.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-jpeg2000.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-jpeg2000.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-png.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-png.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-tiff.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-tiff.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-vnd.adobe.photoshop.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-compressed-xcf.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-compressed-xcf.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-emf.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-emf.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-krita.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-krita.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-portable-bitmap.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-portable-bitmap.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-psd.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-psd.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-psdimage-x-psd.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-psdimage-x-psd.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-tga.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-tga.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-win-bitmap.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-win-bitmap.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-win-bmp.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-win-bmp.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-wmf.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-wmf.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/image-x-xcf.png

This file was deleted.

Binary file added res/oxygen/mimetypes/image-x-xcf.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-database.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-database.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-drawing-template.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-drawing.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-drawing.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-formula.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-formula.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-database.png

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-drawing.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-formula.png

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-presentation.png

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-spreadsheet.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-text-template.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-text.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-oasis-text.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-oasis-web-template.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-presentation.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-presentation.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-spreadsheet-template.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-spreadsheet.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-spreadsheet.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-text-template.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/libreoffice-text.png

This file was deleted.

Binary file added res/oxygen/mimetypes/libreoffice-text.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/text-x-credits.png

This file was deleted.

Binary file added res/oxygen/mimetypes/text-x-credits.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/text-x-java-source.png

This file was deleted.

Binary file added res/oxygen/mimetypes/text-x-java-source.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/text-x-javascript.png

This file was deleted.

Binary file added res/oxygen/mimetypes/text-x-javascript.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/text-x-opml+xml.png

This file was deleted.

Binary file added res/oxygen/mimetypes/text-x-opml+xml.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/text-x-opml.png

This file was deleted.

Binary file added res/oxygen/mimetypes/text-x-opml.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-mp4.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-mp4.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-vivo.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-vivo.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-vnd.rn-realvideo.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-vnd.rn-realvideo.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-wavelet.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-wavelet.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-webm.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-webm.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-anim.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-anim.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-flic.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-flic.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-google-vlc-plugin.png

This file was deleted.

1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-javafx.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-javafx.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-matroska.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-matroska.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-ms-wmp.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-ms-wmp.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-ms-wmv.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-ms-wmv.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-msvideo.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-msvideo.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-ogm+ogg.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-ogm+ogg.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-theor+ogg.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-theor+ogg.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/video-x-wmv.png

This file was deleted.

Binary file added res/oxygen/mimetypes/video-x-wmv.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/x-mail-distribution-list.png

This file was deleted.

Binary file added res/oxygen/mimetypes/x-mail-distribution-list.png
1 change: 0 additions & 1 deletion res/oxygen/mimetypes/x-office-drawing.png

This file was deleted.

Binary file added res/oxygen/mimetypes/x-office-drawing.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-cloud.png

This file was deleted.

Binary file added res/oxygen/places/folder-cloud.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-download.png

This file was deleted.

Binary file added res/oxygen/places/folder-download.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-dropbox.png

This file was deleted.

Binary file added res/oxygen/places/folder-dropbox.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-gdrive.png

This file was deleted.

Binary file added res/oxygen/places/folder-gdrive.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-images.png

This file was deleted.

Binary file added res/oxygen/places/folder-images.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-mail.png

This file was deleted.

Binary file added res/oxygen/places/folder-mail.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-music.png

This file was deleted.

Binary file added res/oxygen/places/folder-music.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-onedrive.png

This file was deleted.

Binary file added res/oxygen/places/folder-onedrive.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-open.png

This file was deleted.

Binary file added res/oxygen/places/folder-open.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-owncloud.png

This file was deleted.

Binary file added res/oxygen/places/folder-owncloud.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-picture.png

This file was deleted.

Binary file added res/oxygen/places/folder-picture.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-pictures.png

This file was deleted.

Binary file added res/oxygen/places/folder-pictures.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-public.png

This file was deleted.

Binary file added res/oxygen/places/folder-public.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-publicshare.png

This file was deleted.

Binary file added res/oxygen/places/folder-publicshare.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-script.png

This file was deleted.

Binary file added res/oxygen/places/folder-script.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-text.png

This file was deleted.

Binary file added res/oxygen/places/folder-text.png
1 change: 0 additions & 1 deletion res/oxygen/places/folder-videos.png

This file was deleted.

Binary file added res/oxygen/places/folder-videos.png
1 change: 0 additions & 1 deletion res/oxygen/places/stock_folder.png

This file was deleted.

Binary file added res/oxygen/places/stock_folder.png
1 change: 0 additions & 1 deletion res/oxygen/places/user-trash-full.png

This file was deleted.

Binary file added res/oxygen/places/user-trash-full.png
8 changes: 4 additions & 4 deletions src/plugins/thirdParty/libgit2/CMakeLists.txt
Expand Up @@ -3,21 +3,21 @@ project(libgit2Plugin)
# Name and version of our package

set(PACKAGE_NAME libgit2)
set(PACKAGE_VERSION 0.28.3)
set(PACKAGE_VERSION 0.28.4)

# Version of our library

set(MAJOR_LIBRARY_VERSION 0)
set(MINOR_LIBRARY_VERSION 28)
set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.3)
set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.4)

# Git tag for our library

set(GIT_TAG v0.28.3-opencor)
set(GIT_TAG v0.28.4-opencor)

# Release tag

set(RELEASE_TAG v0.28.3-opencor)
set(RELEASE_TAG v0.28.4-opencor)

# Specify where our local package will be installed

Expand Down

0 comments on commit f41f6e3

Please sign in to comment.