aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Tagliamonte <paultag@ubuntu.com>2011-12-08 13:38:20 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2011-12-10 16:13:19 (GMT)
commit596c283553fb2da7e9204621347462bb46b83c4d (patch)
treea0daf06274c9905d0f794b8911ae17735717a944
parentcd339169d1961eb508ea89cee2609ec6d0fc0c15 (diff)
downloadfluxbox_paul-596c283553fb2da7e9204621347462bb46b83c4d.zip
fluxbox_paul-596c283553fb2da7e9204621347462bb46b83c4d.tar.bz2
Noting the merge in the ChangeLog.
-rw-r--r--ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4722342..c4eb5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
2 2
3Changes for 1.3.2 3Changes for 1.3.2
4 4
5*11/12/08:
6 * GSoC Integration: Merged Gediminas' branch on top of the git-tree. (Paul)
7 src/FbAtoms.cc
8 src/FbAtoms.hh
9 src/FbTk/FbWindow.cc
10 src/IconButton.cc
11 src/IconButton.hh
12 src/Window.cc
13 src/Window.hh
14 util/Makefile
15 util/fbcompose
16
5*11/10/22: 17*11/10/22:
6 * Bugfix: possible crash at SIGINT / exit (Mathias) 18 * Bugfix: possible crash at SIGINT / exit (Mathias)
7 FbTk/ImageImlib2.cc 19 FbTk/ImageImlib2.cc