aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <ctismer@gmail.com>2015-06-17 18:34:41 +0200
committerChristian Tismer <ctismer@gmail.com>2015-06-17 18:34:41 +0200
commit16f705d3e97ee6ea17b3fb2ec37220dc5c48924e (patch)
tree7daa8ffea9a9b4fc14ca24fb0ced1ff38ae34aad
parent56a033929182ed88ae92927915ae6d71dc6bc99e (diff)
update soubrettes and ignore a local folder 'explore2' with some cmake exploration
-rw-r--r--.gitignore1
m---------sources/pyside215
m---------sources/shiboken210
3 files changed, 12 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index c7a8ad416..5bd432665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
*.pyc
distribute-*.egg
distribute-*.tar.gz
+explore2
diff --git a/sources/pyside2 b/sources/pyside2
-Subproject c868b58611e99d5428f012780053a18856f4fa6
+Subproject cd0f27e7219c64fe6a4a079892f75d1a6af726b
diff --git a/sources/shiboken2 b/sources/shiboken2
-Subproject 40ba9cd714a1cfbbbef4ae031167c7b20902131
+Subproject af111f1634bbaea5e7685fc89ae14dc2c293337