diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-16 11:10:25 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-16 11:10:25 -0300 |
| commit | 9400d166db96fdcb2927245f5163ced0e29f2e07 (patch) | |
| tree | a085760c770bb05b30cfc04ebe905ca5efc1af1d /data/resources/mainwindow.qrc | |
| parent | 7c560dfbd3bba49b9a7aacb791a102e4e1761045 (diff) | |
| parent | cede9683aa7b5f7659506a6532f92aa90a6b1f4e (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/move-slipped-off-changefile' into develop
Diffstat (limited to 'data/resources/mainwindow.qrc')
0 files changed, 0 insertions, 0 deletions