Commit Graph

8 Commits

Author SHA1 Message Date
John Fletcher
7126601304 Minor change to index.html 2015-03-17 21:28:42 +00:00
John Fletcher
1059c6e7c4 Commit release-3.2.0 changes after conflict resolution 2015-03-06 07:27:56 +00:00
John Fletcher
186598d05a doc/maintenance.qbk Correct typo 2015-02-27 08:09:42 +00:00
John Fletcher
5dd99c49e3 doc/maintenance.qbk Fix unresolved merge 2015-02-27 07:58:00 +00:00
John Fletcher
b2fff2c41d Update master with release-3.1.1 2015-02-23 11:53:46 +00:00
John Fletcher
c639ad367f Commit other changes 2015-02-09 18:01:59 +00:00
John Fletcher
58387d2314 doc.maintenance.qbk Minor edit 2015-01-23 17:46:36 +00:00
John Fletcher
9e9e923eb0 resolve differences 2015-01-23 17:45:22 +00:00