diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-04-17 12:14:39 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-04-17 12:14:39 -0300 |
commit | eb940b04bd2921974b094150a763ad8b9bbae8ca (patch) | |
tree | 2b867e3acaf8a86d431f2aeae9cf3dd57abf8e01 /.gitignore | |
parent | dcfaeea8c892ecb962080a1fbdc456bdfe851eea (diff) | |
parent | 1603228feac95c32b62661c15c6edd4c95978827 (diff) |
Merge remote-tracking branch 'refs/remotes/ivan/feature/5506_use-pyside-slot-decorator' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions