Commit Graph

2 Commits

Author SHA1 Message Date
Daniel Molkentin
35efaf4539 Merge remote-tracking branch 'origin/stable45'
Conflicts:
	developer_manual/conf_release.py
	developer_manual/index.rst
	developer_manual/translation.rst
	user_manual/conf_release.py
	user_manual/sync_kde.rst
2012-12-26 21:33:42 +01:00
Jason Spriggs
8a8c780b65 App Development Placeholders
App Dev section placeholders created
2012-12-12 21:49:13 -05:00