rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3/ui/resources_rc.py
This commit is contained in:
grossmj
2018-03-30 12:16:31 +07:00
parent 20ff8a19f6 4c610acfa4
commit c684e63be2
25 changed files with 1866 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/icons/traceng.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

1
resources/resources.qrc
View File

@@ -64,6 +64,7 @@
<file>icons/virtualbox.png</file>
<file>icons/qemu.svg</file>
<file>icons/rtv.png</file>
<file>icons/traceng.png</file>
<file>icons/image.svg</file>
<file>icons/node_conception.svg</file>
<file>icons/raise_z_value.svg</file>