summaryrefslogtreecommitdiffstats
path: root/license.txt
diff options
context:
space:
mode:
authorKyle Johnson <blyxx86@gmail.com>2012-10-05 11:51:31 +0200
committerKyle Johnson <blyxx86@gmail.com>2012-10-05 11:51:31 +0200
commitfad389699e2e851af09c1f4508646194c2f45660 (patch)
tree8a595af2bd1980e4a475f5db5f4ce9f7bc8cd170 /license.txt
parentddb32da0e86510d7e68c5432a1657732a01b5d34 (diff)
parentf20bca9e065751fc271cb650f9246073492eccea (diff)
Fixed conflicts in changelog to reflect all changes.
Conflicts: user_guide_src/source/changelog.rst
Diffstat (limited to 'license.txt')
0 files changed, 0 insertions, 0 deletions