Commit 2bc4ad04 authored by Matias Guijarro's avatar Matias Guijarro
Browse files

Merge branch 'master' of git.epn-campus.eu:Qub

Conflicts:
	CTools/pixmaptools/pixmaptools_lut.cpp
parents 34cecb11 6aa9fbb2
......@@ -37,10 +37,11 @@ struct IO::Data {
extern "C"
{
static int _XError_hanlder(Display *display,XErrorEvent *err)
static int _XError_hanlder(Display *,XErrorEvent *)
{
aRloginFlag = True;
std::cerr << "" << ID << ": Unactive MIT-SHM" << std::endl;
return 0;
}
}
......
#ifndef __PIXMAPTOOLS_LUT
#define __PIXMAPTOOLS_LUT
#include <stdlib.h>
#include "qimage.h"
#include <cstdlib>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment