gunnar: server Makefile,1.99,1.100 release-notes.txt,1.502,1.503

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20214

Modified Files:
	Makefile release-notes.txt 
Log Message:
Complete the ingo package.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- Makefile	22 Jan 2010 16:46:21 -0000	1.99
+++ Makefile	22 Jan 2010 21:11:38 -0000	1.100
@@ -153,7 +153,7 @@
                 kolab-webclient/mimp            \
                 kolab-webclient/passwd          \
                 kolab-webclient/kolab-webclient \
-#                kolab-webclient/ingo            \
+                kolab-webclient/ingo            \
 #                kolab-webclient/mnemo           \
 #                kolab-webclient/nag             \
 #                kolab-webclient/turba           \

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- release-notes.txt	22 Jan 2010 19:59:49 -0000	1.502
+++ release-notes.txt	22 Jan 2010 21:11:38 -0000	1.503
@@ -156,6 +156,7 @@
     ???
 
 Changes between 2.2.3 and 2.2.x:
+(TODOs might need to be merged from kolab_2_2_branch!)
 
     - kolabd-2.2.?-20??????