eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-12 02:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
This commit is contained in:
Tats
2013-11-29 12:09:49 -05:00
parent 97379366e3 0e73f157f8
commit fd958cecf2
40 changed files with 1605 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@@ -1,8 +1,8 @@
// NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability.
#include <iostream>
#include <QApplication>
#include <QtGui>
#include "Common.h"
#include "MainWindow.h"