Added map size to manpage
Merge branch 'master' of https://github.com/a-nikolaev/curseofwar
Merge branch 'master' of https://github.com/Doomicide/curseofwar into Doomicide-master
Merge branch 'master' of https://github.com/a-nikolaev/curseofwar
Quit confirmation dialog
Fix "hyphen-used-as-minus-sign" in manpage

See http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
for further infomation
Old order in Makefile was problematic.

Makefile:

$(CC) $(CFLAGS) -o $(EXEC) grid.o state.o king.o network.o output.o client.o server.o main.o $(LDFLAGS)

The order is problematic. Better use

$(CC) $(CFLAGS) $(LDFLAGS) grid.o state.o king.o network.o output.o client.o server.o main.o -o $(EXEC)

to avoid a FTBFS with binutils-gold.
Merge branch 'master' of https://github.com/a-nikolaev/curseofwar
version 1.1.5
moved LDFLAGS after object files in Makefile
separated LDFLAGS and LDLIBS
version 1.1.6
icons 32x32 and 16x16
updated changelog
Fix Hardening

More info: https://wiki.debian.org/Hardening
Added a desktop menu file
Merge branch 'master' of https://github.com/a-nikolaev/curseofwar
Merge branch 'master' of https://github.com/a-nikolaev/curseofwar
simple timeline added
Merge branch 'menu' of https://github.com/Sicness/curseofwar into Sicness-menu

Conflicts:
	CHANGELOG