summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2012-02-23 20:35:14 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2012-02-23 20:35:14 -0200
commitfde271521a750b7d5936435f8fcac4b86c8540f1 (patch)
treeca72de13df2cb2a979419c57ebc7b733cc36fcaf /.gitignore
parent2c198ea403aa6c374bc062f85ac95b61acbb87ae (diff)
parentbbb7d417e75043dec53c84ceafec5c07cc282a81 (diff)
downloadshiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.tar.gz
shiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.tar.xz
shiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.zip
Merge GeneratorRunner project into Shiboken.HEADmaster
This initial merge introduces few regression that can easily be fixed, they are: - You can't choose what generator will be run, it always run CppGenerator and HeaderGenerator. - DummyGenerator test of GeneratorRunner was commented out. The directory structure is also nto ideal and may change a bit in later commits. Conflicts: CMakeLists.txt data/CMakeLists.txt doc/CMakeLists.txt doc/_templates/index.html doc/_templates/layout.html doc/_themes/pysidedocs/static/pysidedocs.css doc/commandlineoptions.rst doc/conf.py.in doc/contents.rst doc/images/bindinggen-development.png doc/images/boostqtarch.png tests/CMakeLists.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions