SilentSpike 975bc229c6 Merge branch 'master' into ace_spectator ... Conflicts: addons/spectator/stringtable.xml		2015-07-04 18:53:20 +01:00
..
ace3-config-entries.md	headgear influence on hearing	2015-07-01 21:21:09 +02:00
ace3-events-system.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
arma-3-issues.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
arma-3-scheduler-and-our-practices.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
branching-and-release.md	Made image click-able	2015-05-16 20:37:42 +02:00
coding-guidelines.md	Documentation pass 8	2015-07-01 21:19:26 +02:00
Documentation guidelines and tips.md	Documentation pass 3	2015-05-17 21:01:17 +02:00
extension-guidelines.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
how-to-translate-ace3.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
merging-pull-requests.md	add description fields to frontmatter header	2015-05-15 09:45:15 +02:00
modularity-and-pbo-structure.md	fix typo, add inert/not-inert description	2015-05-28 18:04:08 +03:00
setting-up-the-development-environment.md	Merge branch 'master' into ace_spectator	2015-07-04 18:53:20 +01:00