Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into extend_firewall_api
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Nov 30, 2018
2 parents 43a1ff1 + 0781c64 commit 22d48e1
Show file tree
Hide file tree
Showing 36 changed files with 91 additions and 84 deletions.
2 changes: 2 additions & 0 deletions configure.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
@YAST2-CHECKS-YCP@
@YAST2-CHECKS-TESTSUITE@

icondir=/usr/share/icons
AC_SUBST(icondir)
AC_MSG_CHECKING([for ifcfg location])
# fallback, default on openSUSE
IFCFG_DIR=/etc/sysconfig/network
Expand Down
22 changes: 21 additions & 1 deletion data/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,25 @@ xversiondir = $(sysconfdir)/YaST2
xversion_DATA = \
XVersion

EXTRA_DIST = $(xversion_DATA)
scalabledir = @icondir@/hicolor/scalable/apps
scalable_DATA = \
icons/hicolor/scalable/apps/yast-hardware-group.svg \
icons/hicolor/scalable/apps/yast-high_availability-group.svg \
icons/hicolor/scalable/apps/yast-messages.svg \
icons/hicolor/scalable/apps/yast-misc-group.svg \
icons/hicolor/scalable/apps/yast-network-group.svg \
icons/hicolor/scalable/apps/yast-remote-chooser.svg \
icons/hicolor/scalable/apps/yast-remote-install.svg \
icons/hicolor/scalable/apps/yast-security-group.svg \
icons/hicolor/scalable/apps/yast-software-group.svg \
icons/hicolor/scalable/apps/yast-support-group.svg \
icons/hicolor/scalable/apps/yast-system-group.svg \
icons/hicolor/scalable/apps/yast-vm-group.svg \
icons/hicolor/scalable/apps/yast.svg \
icons/hicolor/scalable/status/dialog-error.svg \
icons/hicolor/scalable/status/dialog-information.svg \
icons/hicolor/scalable/status/dialog-question.svg \
icons/hicolor/scalable/status/dialog-warning.svg

EXTRA_DIST = $(xversion_DATA) $(scalable_DATA)
include $(top_srcdir)/Makefile.am.common
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-hardware-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-messages.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-misc-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-network-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-remote-chooser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-remote-install.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-security-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-software-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-support-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-system-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/icons/hicolor/scalable/apps/yast-vm-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 22d48e1

Please sign in to comment.