diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-12 12:19:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-12 12:19:03 -0300 |
| commit | 8969c7396c61be96040206ff18a29ec56e20825e (patch) | |
| tree | 6a460594630d2e5bd77b51c2958345a48919ed42 /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 4164cdc488ba0c41f4e19ad7344a6428e4169fd0 (diff) | |
| parent | 58e4317945ac857bb57d2a20e38fe9a632b19df0 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4670_disable-eip-and-disable-actions' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
0 files changed, 0 insertions, 0 deletions