Ticket #13 (closed task: fixed)

Opened 2 years ago

Last modified 2 years ago

Merge sources

Reported by: jcverdie Assigned to: rmeneu
Priority: major Milestone: Robespierre
Component: BAL-ify Version: 1.0
Keywords: Cc:
Number of hours worked: 50 % Complete: 100
Number of hours remaining: 0

Description

Merge Apple sources with our changes

Change History

11/02/06 18:20:54 changed by sgodard

  • status changed from new to assigned.

11/02/06 18:22:50 changed by sgodard

En cours Le merge avec la branche DANTON_BAL c'est très bien passé mais le merge avec la nouvelle reorg de source pose quelque pb ce qui fait que ca risque d'être plus long que prévu

11/03/06 14:57:31 changed by admin

  • status changed from assigned to new.
  • component changed from BAL-ify to Bug Fix.

11/03/06 14:58:04 changed by admin

  • component changed from Bug Fix to BAL-ify.

11/03/06 15:22:38 changed by admin

  • owner changed from sgodard to admin.
  • status changed from new to assigned.

11/03/06 15:23:19 changed by admin

  • owner changed from admin to rmeneu.
  • status changed from assigned to new.

merge terminé pour ma partie je passe le bébé à ronan

11/06/06 10:47:37 changed by rmeneu

  • status changed from new to assigned.

11/07/06 17:35:43 changed by jcverdie

Use of a visual diff editor (tk diff) enhances the rythm of the task...

11/07/06 18:10:04 changed by jcverdie

  • hours_worked set to 20.
  • percent set to 30.
  • hours_togo set to 30.

11/09/06 15:09:56 changed by jcverdie

  • hours_worked changed from 20 to 23.
  • hours_togo changed from 30 to 27.

link stage

11/10/06 14:32:24 changed by jcverdie

  • hours_worked changed from 23 to 31.

3 remaining unresolved then will fix segfaults

11/14/06 16:52:40 changed by jcverdie

  • hours_worked changed from 31 to 38.
  • hours_togo changed from 27 to 8.

- Stable - Test BAL 100% - Support minimal des widgets - Support des mimetypes/contentTypes en cours

11/14/06 17:10:10 changed by jcverdie

  • percent changed from 30 to 80.

12/18/06 12:37:30 changed by sroret

  • hours_worked changed from 38 to 50.
  • resolution set to fixed.
  • status changed from assigned to closed.
  • percent changed from 80 to 100.
  • hours_togo deleted.

Added roughly 12 hours to merge into current trunk. merge from WebKit ToT is now over.