Merge tag 'v1.13.2' into wx3

Browse Source

Conflicts:
	config.py
	A lot of icons

...

This commit is contained in:

blitzmann

2015-07-20 13:21:00 -04:00

parent 5372f31be8 b4604f8207

commit e12b3f3054

137 changed files with 1183 additions and 774 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/eve.db

Binary file not shown.

BIN

staticdata/icons/icon07_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 879 B

BIN

staticdata/icons/icon107_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon107_10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 858 B

BIN

staticdata/icons/icon107_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 864 B

BIN

staticdata/icons/icon107_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 883 B

BIN

staticdata/icons/icon107_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon107_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

staticdata/icons/icon107_64_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 851 B

BIN

staticdata/icons/icon108_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_64_22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/icon108_7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon108_8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon109_64_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 788 B

BIN

staticdata/icons/icon109_64_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 750 B

BIN

staticdata/icons/icon118_64_7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

staticdata/icons/icon119_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

staticdata/icons/icon1337_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

staticdata/icons/icon1337_22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

staticdata/icons/icon5_64_17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 850 B

BIN

staticdata/icons/icon5_64_18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 922 B

BIN

staticdata/icons/icon5_64_19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 912 B

BIN

staticdata/icons/icon5_64_20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 915 B

BIN

staticdata/icons/icon5_64_21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 914 B

BIN

staticdata/icons/iconIcon_64px_Fireworks.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

staticdata/icons/iconremote_armor_repair.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 750 B

BIN

staticdata/icons/iconremote_hull_repairer.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

staticdata/icons/ships/32811.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

staticdata/icons/ships/34151.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

staticdata/icons/ships/34496.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

staticdata/icons/ships/34828.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.2 KiB

BIN

staticdata/icons/ships/35683.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

staticdata/icons/ships/35779.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

staticdata/icons/ships/35781.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB