Xpad

Merge lp:~arthurborsboom/xpad/xpad-4.2 into lp:xpad

  1. xpad-4.2
  2. Merge into trunk
Proposed by Arthur Borsboom
Status: Merged
Merged at revision: 647
Proposed branch: lp:~arthurborsboom/xpad/xpad-4.2
Merge into: lp:xpad
Diff against target: 34 lines (+5/-5)
2 files modified
ChangeLog (+5/-4)
src/xpad-undo.c (+0/-1)
To merge this branch: bzr merge lp:~arthurborsboom/xpad/xpad-4.2
Reviewer Review Type Date Requested Status
Arthur Borsboom Approve
Review via email: mp+190023@code.launchpad.net

Description of the change

Fix compilation error against glib-2.34.1
Update changelog

To post a comment you must log in.
Revision history for this message
Arthur Borsboom (arthurborsboom) :
review: Approve
lp:~arthurborsboom/xpad/xpad-4.2 updated
647. By Arthur Borsboom

Fix compilation error against glib-2.34.1 lp:974011, Update changelog lp:890327

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-10-08 15:30:08 +0000
3+++ ChangeLog 2013-10-09 04:30:11 +0000
4@@ -1,14 +1,15 @@
5-Changes in v4.2
6+Changes in v4.2 - Arthur Borsboom <arthurborsboom@gmail.com>
7
8 - New: Undo functionality such as CTRL-Z (#1121740)
9 - New: Tray click behaviour can now be configured (#345278, #304331, #890335)
10 - New: Tray icon can be hidden (#890334)
11 - New: Theme builders can now use seperate tray icon by adding xpad-panel.xvg (#907705)
12 - Fix: Theme color stays after application restart (#307669)
13-- Fix: Translation French typo (#1216388)
14-- Fix: Translation Russian typo which prevented the Help from working (#973825)
15+- Fix: Translation - get many new translations in from translators (thanks guys!!)
16+- Fix: Translation - French typo (#1216388)
17+- Fix: Translation - Russian typo which prevented the Help from working (#973825)
18 - Fix: added missing configure script (#890492)
19-- Fix: performance improvement by reducing the amount of harddisk writes (#1072698, #782320)
20+- Fix: performance improvement by reducing the amount of harddisk writes (#1072698, #1207564, #782320)
21 - Fix: can now compile against glib-2.34.1 (#974011)
22
23 2004-09-29 Jeroen T. Vermeulen <jtv@xs4all.nl>
24
25=== modified file 'src/xpad-undo.c'
26--- src/xpad-undo.c 2011-11-16 18:10:04 +0000
27+++ src/xpad-undo.c 2013-10-09 04:30:11 +0000
28@@ -23,7 +23,6 @@
29 #include "../config.h"
30 #include <stdlib.h>
31 #include <glib.h>
32-#include <glib/glist.h>
33 #include "xpad-undo.h"
34 #include "xpad-text-buffer.h"
35

Subscribers

People subscribed via source and target branches