1 --- blackbox-0.70.1/lib/Resource.cc~ 2005-04-06 23:16:50.000000000 +0200
2 +++ blackbox-0.70.1/lib/Resource.cc 2012-01-11 15:21:17.675011644 +0100
6 #include <X11/Xresource.h>
11 --- blackbox-0.70.1/lib/Image.cc~ 2005-04-08 17:41:09.000000000 +0200
12 +++ blackbox-0.70.1/lib/Image.cc 2012-01-11 15:27:22.674988031 +0100
19 // #define COLORTABLE_DEBUG
20 // #define MITSHM_DEBUG
21 --- blackbox-0.70.1/lib/XDG.cc~ 2005-04-06 16:04:38.000000000 +0200
22 +++ blackbox-0.70.1/lib/XDG.cc 2012-01-11 15:42:22.908223679 +0100
30 // make sure directory names end with a slash
31 --- blackbox-0.70.1/src/BlackboxResource.cc~ 2005-10-18 09:34:46.000000000 +0200
32 +++ blackbox-0.70.1/src/BlackboxResource.cc 2012-01-11 15:47:10.752352766 +0100
35 #include <X11/Xutil.h>
36 #include <X11/cursorfont.h>
40 BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
41 --- blackbox-0.70.1/src/ScreenResource.cc~ 2005-04-13 07:54:08.000000000 +0200
42 +++ blackbox-0.70.1/src/ScreenResource.cc 2012-01-11 15:48:21.508187413 +0100
44 #include <Resource.hh>
50 static const int iconify_width = 9;
51 --- blackbox-0.70.1/src/Screen.cc~ 2005-10-18 10:07:22.000000000 +0200
52 +++ blackbox-0.70.1/src/Screen.cc 2012-01-11 15:50:26.161508387 +0100
60 static bool running = true;
61 --- blackbox-0.70.1/src/main.cc~ 2005-01-03 10:42:57.000000000 +0100
62 +++ blackbox-0.70.1/src/main.cc 2012-01-11 15:51:55.055666254 +0100
64 #include "../version.h"
70 static void showHelp(int exitval) {
71 --- blackbox-0.70.1/util/bsetroot.cc~ 2005-03-15 08:01:37.000000000 +0100
72 +++ blackbox-0.70.1/util/bsetroot.cc 2012-01-11 16:22:52.285480550 +0100
75 #include <X11/Xatom.h>
81 // ignore all X errors