From 596c283553fb2da7e9204621347462bb46b83c4d Mon Sep 17 00:00:00 2001
From: Paul Tagliamonte <paultag@ubuntu.com>
Date: Thu, 8 Dec 2011 13:38:20 +0000
Subject: Noting the merge in the ChangeLog.

---
 ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4722342..c4eb5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 
 Changes for 1.3.2
 
+*11/12/08:
+    * GSoC Integration: Merged Gediminas' branch on top of the git-tree. (Paul)
+    src/FbAtoms.cc
+    src/FbAtoms.hh
+    src/FbTk/FbWindow.cc
+    src/IconButton.cc
+    src/IconButton.hh
+    src/Window.cc
+    src/Window.hh
+    util/Makefile
+    util/fbcompose
+
 *11/10/22:
     * Bugfix: possible crash at SIGINT / exit (Mathias)
     FbTk/ImageImlib2.cc
-- 
cgit v0.11.2