diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-13 10:52:23 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-13 10:52:23 -0300 |
| commit | 037696b4cfc6fe172f3d3200c6737813b054faa1 (patch) | |
| tree | b463e142a18e069c99106abe081d487c076824b1 /.gitignore | |
| parent | bd2df4ea6fd11f1285c07591367259f3900a93fc (diff) | |
| parent | 14e2207a58e79360bd48507b5e386ec944d8dd74 (diff) | |
Merge ApiExtractor into Shiboken to be used as a static library.
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 40d69886e..adb1e4594 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,5 @@ build *.pyc *.o *.so -.preprocessed.tmp .*.swp *.kdev4 |