Tats 559a7ebf90 Merge branch 'develop' into statesaving ...

Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp

2014-01-05 18:06:41 -05:00

..

controller

add controller.h prototype

2013-12-10 14:38:26 -05:00

glfw

Add prototype with glfw

2013-09-18 15:50:29 -04:00

gtk

add a gtkglext prototype

2013-09-18 15:14:26 -04:00

properties

add a prototype of properties

2013-12-09 13:59:19 -05:00

sdl

Add a prototype using SDL

2013-09-18 15:14:21 -04:00

shm

add shm proto

2013-11-23 19:50:20 -05:00

wx-01-simple

Merge remote-tracking branch 'vliaskov/try-to-catch-key'

2013-11-29 11:49:48 -05:00

wx-02-input-output

Merge branch 'master' of github.com:libremapping/libremapping

2013-11-23 14:07:49 -05:00

wx-03-polyline

rename polyline to add "03" prefix

2013-11-15 13:44:49 +01:00