diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-09-05 16:19:27 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-09-05 16:19:27 -0300 |
| commit | a96c163b3ef6281eae1cf9c04fcbeb46b9fc43f4 (patch) | |
| tree | 0de24bdf00b62f28f8ddf90b1d4cf497737dc437 /data/resources | |
| parent | 125a83037657bd7783ebc5b9e8aca75b5e886780 (diff) | |
| parent | b7b2c18b8d8ae09ac7f5ad86173380bf69409b80 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/6048_python2-bitmask-root' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions