diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-06-24 16:15:26 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-06-24 16:15:26 -0300 |
commit | 3c85990cf6fb9f6f9e593d562e121b6659f2bf88 (patch) | |
tree | 13389326ad787c709170b6b68ef8a20a19dff473 /.gitattributes | |
parent | 862526f4c877cfb546352115a5b76cc09e981c16 (diff) | |
parent | 3def1e7b086f8048d2b07158ee1fc6c8bd2b506e (diff) |
Merge remote-tracking branch 'ivan/feature/add-pyside-tests-helper' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions