| commit | fad389699e2e851af09c1f4508646194c2f45660 | [log] [tgz] |
|---|---|---|
| author | Kyle Johnson <blyxx86@gmail.com> | Fri Oct 05 02:51:31 2012 -0700 |
| committer | Kyle Johnson <blyxx86@gmail.com> | Fri Oct 05 02:51:31 2012 -0700 |
| tree | 8a595af2bd1980e4a475f5db5f4ce9f7bc8cd170 | |
| parent | ddb32da0e86510d7e68c5432a1657732a01b5d34 [diff] | |
| parent | f20bca9e065751fc271cb650f9246073492eccea [diff] |
Fixed conflicts in changelog to reflect all changes. Conflicts: user_guide_src/source/changelog.rst