Commit Graph

7 Commits

Author SHA1 Message Date
Tats
fd958cecf2 Merge branch 'master' of github.com:libremapping/libremapping
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
2013-11-29 12:09:49 -05:00
Alexandre Quessy
ed1056527d Always draw OpenGL shapes' vertices in a counterclockwise order 2013-11-26 22:08:02 -05:00
Tats
11616282b0 Allows selection of the source: changes the source in the canvases 2013-11-26 13:38:36 -05:00
Tats
89f8ba130b Automatically added pre-loaded source images to list view 2013-11-25 23:43:59 -05:00
Tats
0ff60f6108 - Added an empty QListView in the layout, with two splitters
- Also created a class for the main window
2013-11-25 23:16:32 -05:00
Tats
06ecc20f83 Multi-source harcoded: switch between mappings 2013-11-16 11:41:39 +01:00
Tats
32924471e0 Copy wx-02-input-output to root 2013-11-15 16:12:22 +01:00