From b8c2fc57fc4711293e487c6a8df95de5188f9c28 Mon Sep 17 00:00:00 2001
From: Jon Skeet <skeet@pobox.com>
Date: Wed, 22 Oct 2008 14:19:05 +0100
Subject: [PATCH] Fixed bug in GeneratedBuilder.MergeFrom - only fields already
 set in builder would be merged.

---
 todo.txt | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/todo.txt b/todo.txt
index 9443e0abc9..719615580f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,14 +1,13 @@
 Current task list (not in order)
 
-1) Fix GeneratedBuilder.MergeFrom
-2) Extra unit tests for pending Java optimisation
-3) Refactor IsInitialized
-4) Performance framework
-5) Optionally remove dependencies to core and csharp options
-6) Remove multifile support
-7) Remove bootstrapping hack
-8) Improve "regenerating descriptor.proto" hack
-10) Mono support
-11) Docs
-12) Clean up protogen code
-13) Add flags to protogen
+- Extra unit tests for pending Java optimisation
+- Refactor IsInitialized
+- Performance framework
+- Optionally remove dependencies to core and csharp options
+- Remove multifile support
+- Remove bootstrapping hack
+- Improve "regenerating descriptor.proto" hack
+- Mono support
+- Docs
+- Clean up protogen code
+- Add flags to protogen