Commit Graph

6 Commits

Author SHA1 Message Date
Petr Mrázek
c91adfb3d1 Merge branch 'master' into develop
Conflicts:
	CMakeLists.txt
	changelog.md
2014-07-20 14:23:14 +02:00
Petr Mrázek
77d9360d25 Bump version and add to changelog. 2014-07-20 13:01:21 +02:00
Petr Mrázek
222c26f9cf Bump dev version 2014-07-14 02:43:10 +02:00
Petr Mrázek
8bb906bbd7 Fix last minute derps
* Changelog formatting
* Update dialog popping up on start even when it shouldn't
2014-07-14 01:11:52 +02:00
Petr Mrázek
e7f67a73b3 Update changelog 2014-07-14 00:58:19 +02:00
Petr Mrázek
6349800f07 Fix mod list sorting predicate, convert the changelog to markdown and reverse it. 2014-07-08 23:05:33 +02:00