Merge branch 'master' into wx3

Browse Source

Conflicts:
	config.py
	staticdata/icons/icon01_08.png
	staticdata/icons/icon02_11.png
	staticdata/icons/icon105_46.png
	staticdata/icons/icon105_47.png
	staticdata/icons/icon105_48.png
	staticdata/icons/icon105_49.png
	staticdata/icons/icon108_5.png
	staticdata/icons/icon113_64_1.png
	staticdata/icons/icon113_64_2.png
	staticdata/icons/icon113_64_3.png
	staticdata/icons/icon34_16.png
	staticdata/icons/iconMarketIcon_16px_Amarr.png
	staticdata/icons/iconMarketIcon_16px_Caldari.png
	staticdata/icons/iconMarketIcon_16px_Gallente.png
	staticdata/icons/iconMarketIcon_16px_Minmatar.png

...

This commit is contained in:

blitzmann

2015-08-15 10:50:58 -04:00

parent c2ca5dffe8 598512a904

commit 48f96a7a32

859 changed files with 1752 additions and 1963 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

staticdata/icons/icon01_08.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 866 B After Width:  |  Height:  |  Size: 665 B

BIN

staticdata/icons/icon02_11.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 695 B After Width:  |  Height:  |  Size: 678 B

BIN

staticdata/icons/icon105_46.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 865 B After Width:  |  Height:  |  Size: 793 B

BIN

staticdata/icons/icon105_47.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 820 B After Width:  |  Height:  |  Size: 687 B

BIN

staticdata/icons/icon105_48.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 907 B After Width:  |  Height:  |  Size: 807 B

BIN

staticdata/icons/icon105_49.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 876 B After Width:  |  Height:  |  Size: 760 B

BIN

staticdata/icons/icon107_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 705 B

BIN

staticdata/icons/icon107_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 768 B

BIN

staticdata/icons/icon107_3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 849 B

BIN

staticdata/icons/icon108_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 708 B

BIN

staticdata/icons/icon108_10.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 712 B

BIN

staticdata/icons/icon108_11.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 714 B

BIN

staticdata/icons/icon108_12.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 717 B

BIN

staticdata/icons/icon108_13.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 719 B

BIN

staticdata/icons/icon108_14.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 679 B

BIN

staticdata/icons/icon108_15.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 678 B

BIN

staticdata/icons/icon108_16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 645 B

BIN

staticdata/icons/icon108_17.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 673 B

BIN

staticdata/icons/icon108_18.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 744 B

BIN

staticdata/icons/icon108_19.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 736 B

BIN

staticdata/icons/icon108_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 698 B

BIN

staticdata/icons/icon108_20.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 736 B

BIN

staticdata/icons/icon108_21.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 743 B

BIN

staticdata/icons/icon108_3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 707 B

BIN

staticdata/icons/icon108_4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 711 B

BIN

staticdata/icons/icon108_5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 809 B After Width:  |  Height:  |  Size: 646 B

BIN

staticdata/icons/icon108_6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 652 B

BIN

staticdata/icons/icon108_64_22.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 709 B

BIN

staticdata/icons/icon108_7.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 649 B

BIN

staticdata/icons/icon108_8.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 652 B

BIN

staticdata/icons/icon113_64_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 871 B

BIN

staticdata/icons/icon113_64_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1005 B After Width:  |  Height:  |  Size: 860 B

BIN

staticdata/icons/icon113_64_3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 991 B After Width:  |  Height:  |  Size: 859 B

BIN

staticdata/icons/icon118_64_7.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 497 B

BIN

staticdata/icons/icon119_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 522 B

BIN

staticdata/icons/icon1337_21.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 905 B

BIN

staticdata/icons/icon1337_22.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 616 B

BIN

staticdata/icons/icon34_16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 972 B After Width:  |  Height:  |  Size: 738 B

BIN

staticdata/icons/iconIcon_64px_Fireworks.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 968 B

BIN

staticdata/icons/iconMarketIcon_16px_Amarr.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 727 B After Width:  |  Height:  |  Size: 602 B

BIN

staticdata/icons/iconMarketIcon_16px_Caldari.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 896 B After Width:  |  Height:  |  Size: 462 B

BIN

staticdata/icons/iconMarketIcon_16px_Gallente.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 824 B After Width:  |  Height:  |  Size: 730 B

BIN

staticdata/icons/iconMarketIcon_16px_Minmatar.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 875 B After Width:  |  Height:  |  Size: 638 B

BIN

staticdata/icons/iconremote_hull_repairer.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 748 B