grossmj e1d2bcca20 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3/ui/main_window_ui.py
#	gns3/ui/resources_rc.py
#	gns3/version.py
#	resources/resources.qrc

2018-01-23 12:44:02 +07:00

..

charcoal_icons

Lock or unlock all items button. Fixes #1134.

2017-08-11 14:37:45 +08:00

classic_icons

Lock or unlock all items button. Fixes #1134.

2017-08-11 14:37:45 +08:00

icons

dialog-warning.svg fallback for themed icon (Ref. #2245)

2017-08-31 11:37:32 +02:00

images

Update VMware promotion in setup wizard.

2018-01-08 18:41:40 +07:00

styles

Fix Checkbox and radio button are not readable with charcoal style

2016-05-16 16:42:42 +02:00

symbols

Remove unused symbols. Fixes #2320.

2017-11-19 14:50:12 +07:00

resources.qrc

Update VMware promotion in setup wizard.

2018-01-08 18:41:40 +07:00