Merge commit '5d88501'

Browse Source

Conflicts:
	fonts/lucida_sans_100.png
	fonts/lucida_sans_110.png
	fonts/lucida_sans_120.png
	fonts/lucida_sans_140.png
	fonts/lucida_sans_160.png
	fonts/lucida_sans_180.png
	fonts/lucida_sans_200.png
	fonts/lucida_sans_220.png
	fonts/lucida_sans_240.png
	fonts/lucida_sans_260.png
	fonts/lucida_sans_280.png
	fonts/lucida_sans_360.png
	fonts/lucida_sans_40.png
	fonts/lucida_sans_480.png
	fonts/lucida_sans_560.png
	fonts/lucida_sans_60.png
	fonts/lucida_sans_80.png
	fonts/lucida_sans_90.png
	fonts/mono_dejavu_sans_100.png
	fonts/mono_dejavu_sans_110.png
	fonts/mono_dejavu_sans_120.png
	fonts/mono_dejavu_sans_140.png
	fonts/mono_dejavu_sans_160.png
	fonts/mono_dejavu_sans_180.png
	fonts/mono_dejavu_sans_200.png
	fonts/mono_dejavu_sans_220.png
	fonts/mono_dejavu_sans_240.png
	fonts/mono_dejavu_sans_260.png
	fonts/mono_dejavu_sans_280.png
	fonts/mono_dejavu_sans_40.png
	fonts/mono_dejavu_sans_60.png
	fonts/mono_dejavu_sans_80.png
	fonts/mono_dejavu_sans_90.png
	textures/base/pack/dirt_bg.png
	textures/base/pack/server_flags_pvp.png

...

This commit is contained in:

proller 2015-10-16 22:40:29 +03:00

parent 4c080c3b82 5d88501a57

commit da4b684086

29 changed files with 0 additions and 0 deletions

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

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

BIN

textures/base/pack/camera_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 789 B After Width:  |  Height:  |  Size: 729 B

BIN

textures/base/pack/chat_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 777 B After Width:  |  Height:  |  Size: 399 B

BIN

textures/base/pack/debug_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 960 B After Width:  |  Height:  |  Size: 895 B

BIN

textures/base/pack/dirt_bg.png Normal file

Binary file not shown.

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

BIN

textures/base/pack/down.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

textures/base/pack/down_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 843 B After Width:  |  Height:  |  Size: 373 B

BIN

textures/base/pack/drop_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 561 B After Width:  |  Height:  |  Size: 539 B

BIN

textures/base/pack/fast_btn.png

Binary file not shown.

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

BIN

textures/base/pack/fly_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 783 B After Width:  |  Height:  |  Size: 720 B

BIN

textures/base/pack/halo.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 194 B After Width:  |  Height:  |  Size: 83 B

BIN

textures/base/pack/inventory_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 733 B After Width:  |  Height:  |  Size: 343 B

BIN

textures/base/pack/jump_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 621 B After Width:  |  Height:  |  Size: 434 B

BIN

textures/base/pack/left_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 742 B After Width:  |  Height:  |  Size: 400 B

BIN

textures/base/pack/logo.png

Binary file not shown.

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

BIN

textures/base/pack/menu_header.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 130 KiB After Width:  |  Height:  |  Size: 124 KiB

BIN

textures/base/pack/minimap_mask_round.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 1.8 KiB

BIN

textures/base/pack/minimap_mask_square.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 420 B

BIN

textures/base/pack/minimap_overlay_round.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

textures/base/pack/minimap_overlay_square.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

textures/base/pack/no_screenshot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 476 B After Width:  |  Height:  |  Size: 140 B

BIN

textures/base/pack/noclip_btn.png

Binary file not shown.

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

BIN

textures/base/pack/player_marker.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

textures/base/pack/rangeview_btn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

textures/base/pack/right_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 770 B After Width:  |  Height:  |  Size: 396 B

BIN

textures/base/pack/server_flags_damage.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 774 B After Width:  |  Height:  |  Size: 713 B

BIN

textures/base/pack/smoke_puff.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.2 KiB

BIN

textures/base/pack/sunrisebg.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.1 KiB

BIN

textures/base/pack/unknown_item.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 292 B

BIN

textures/base/pack/up_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 704 B After Width:  |  Height:  |  Size: 373 B