openerp-doc team mailing list archive

[Olivier Laurent <olt@xxxxxxxxxxx>]

The documentation was built successfully.

------------------------------------------------------------
revno: 746
committer: Don Kirkby <donkirkby+launpd@xxxxxxxxx>
branch nick: 6.0
timestamp: Mon 2011-02-21 16:24:27 -0800
message:
  [MERGE] Add back a link that got lost in the merge.
------------------------------------------------------------
revno: 745 [merge]
committer: Don Kirkby <donkirkby+launpd@xxxxxxxxx>
branch nick: 6.0
timestamp: Mon 2011-02-21 12:46:11 -0800
message:
  [MERGE] revisions 477 to 486 from the 5.0 branch.
------------------------------------------------------------
revno: 744 [merge]
committer: Don Kirkby <donkirkby+launpd@xxxxxxxxx>
branch nick: 6.0
timestamp: Mon 2011-02-21 12:20:37 -0800
message:
  [MERGE] Merge 'Open ERP' -> 'OpenERP' change from 5.0 branch. Didn't require any actual changes because the change was made in both branches.
------------------------------------------------------------
revno: 743 [merge]
committer: Don Kirkby <donkirkby+launpd@xxxxxxxxx>
branch nick: 6.0
timestamp: Mon 2011-02-21 12:10:44 -0800
message:
  [MERGE] Merge up to revision 475 of 5.0 branch. (Base revision was 433, and there are more revisions left to merge.) Did not merge changes from source/book/2/2_5_CRM images folders because they seemed to have been rolled back on the 5.0 branch and the merge was a mess. Spanish translation had a bunch of new translations in 5.0 and seemed to just be regenerated in 6.0, so I just pasted the 5.0 content over the 6.0 content without merging. You may need to regenerate.
------------------------------------------------------------
revno: 742
committer: Els Van Vossel <openerp@evv-laptop>
branch nick: doc_update_v6
timestamp: Mon 2011-02-21 08:46:31 +0100
message:
  [IMP] changed to hypermatix
------------------------------------------------------------
revno: 741
committer: Fabien Meghazi <fme@xxxxxxxxxxx>
branch nick: doc-trunk-v6
timestamp: Thu 2011-02-17 14:23:33 +0100
message:
  [ADD] index.php v6.0 base link
------------------------------------------------------------
revno: 740
author: Olivier Ligot <olivier.ligot@xxxxxxxxxx>
committer: Julien Thewys <jth@xxxxxxxxxxx>
branch nick: build_deploy_v6_windows
timestamp: Thu 2011-02-17 11:35:08 +0100
message:
  [ADD] Developer: build and deploy part
------------------------------------------------------------
revno: 739
committer: vro<vro@xxxxxxxxxxx>
branch nick: doc_update_v6
timestamp: Wed 2011-02-16 19:06:39 +0530
message:
  [REV]: Grammar and Screenshot: OpenERP Book
------------------------------------------------------------
revno: 738
committer: vro<vro@xxxxxxxxxxx>
branch nick: doc_update_v6
timestamp: Wed 2011-02-16 12:12:45 +0530
message:
  [REV]: Grammar: Installation
------------------------------------------------------------
revno: 737
committer: vro<vro@xxxxxxxxxxx>
branch nick: doc_update_v6
timestamp: Tue 2011-02-15 18:51:22 +0530
message:
  [REV]: Grammar: Installation
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.