Merge branch 'master' of github.com:brmlab/povoden

Browse source

Conflicts:
	Makefile

...

This commit is contained in:

Peter Boráros 2013-06-04 02:02:44 +02:00

parent d1a061656c 0364ecc761

commit 6d899064de

9 changed files with 254 additions and 147 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/doprava.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 228 KiB After Width:  |  Height:  |  Size: 241 KiB