Merge branch 'stable-1.1'

Browse Source

Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp

...

This commit is contained in:

Vesa

2014-11-02 07:46:32 +02:00

parent 671833a1dd e801376ff4

commit fa9674521e

8 changed files with 504 additions and 454 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

data/dmg_branding.png

Binary file not shown.

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

891

data/locale/ja.ts

File diff suppressed because it is too large Load Diff