diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-08-13 11:46:15 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-08-13 11:46:15 -0300 |
commit | 8eff8582f39c5f3872f75ebd2c530a17d366310d (patch) | |
tree | b963877615cff7cf98867d56d46f22305fd646c9 /src | |
parent | 3274c7c52f5afb1481197686c0d2961a605aae8e (diff) | |
parent | 516c732fc603a8d26d30110f4fbab1e991006010 (diff) |
Merge remote-tracking branch 'refs/remotes/elijah/bugfix/flags' into develop
Diffstat (limited to 'src')
-rw-r--r-- | src/leap/bitmask/gui/ui/eip_status.ui | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui index 4aaa682a..0fb861bc 100644 --- a/src/leap/bitmask/gui/ui/eip_status.ui +++ b/src/leap/bitmask/gui/ui/eip_status.ui @@ -266,6 +266,7 @@ </widget> <resources> <include location="../../../../../data/resources/icons.qrc"/> + <include location="../../../../../data/resources/flags.qrc"/> </resources> <connections/> </ui> |