From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Mon, 15 Oct 2012 13:31:03 +0000 (+0200)
Subject: .gitignore: add build/gumstix/qt/.installjammerinfo and mkspecs/qws/linux-omap3-g++
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/2360e2effdfc7f22dc90503a5daa05dca483ec71

.gitignore: add build/gumstix/qt/.installjammerinfo and mkspecs/qws/linux-omap3-g++
---

diff --git a/.gitignore b/.gitignore
index 37f66922..c8908662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,4 @@ cscope.out
 .emacs.desktop
 build/gumstix/qt/OMAP*
 build/gumstix/qt/arm*
-build/gumstix/OMAP*
-
+build/gumstix/qt/.installjammerinfo
diff --git a/src/3rdparty/qt b/src/3rdparty/qt
index d16ba0a9..45813dde 160000
--- a/src/3rdparty/qt
+++ b/src/3rdparty/qt
@@ -1 +1 @@
-Subproject commit d16ba0a93d611689bce9a2732a1cc8c9a317f5bf
+Subproject commit 45813dde34604afbbdd1181cc56b4d6b93345a01