summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-04-15 16:30:13 +0200
committerParménides GV <parmegv@sdf.org>2013-04-15 16:30:13 +0200
commitbb4e2e8f16f79c59806a017d8f37e2bdd10a4e87 (patch)
tree6e1c13f8b23774277e427953215143fa7d51dbb5 /res
parent60e5f181c1a9f4f1851aafd059971ba5d05748f3 (diff)
parent5f66e5765f52aab1907939018e40578e939dbc5f (diff)
Merge branch 'wizard' into feature/wizard
Conflicts: src/se/leap/leapclient/ConfigHelper.java src/se/leap/leapclient/ConfigurationWizard.java src/se/leap/leapclient/ProviderAPI.java
Diffstat (limited to 'res')
-rw-r--r--res/raw/leapkeystore.bksbin1487 -> 1437 bytes
-rw-r--r--res/raw/leapkeystore_bc147.bksbin0 -> 2871 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/res/raw/leapkeystore.bks b/res/raw/leapkeystore.bks
index 2e853ac4..b972172c 100644
--- a/res/raw/leapkeystore.bks
+++ b/res/raw/leapkeystore.bks
Binary files differ
diff --git a/res/raw/leapkeystore_bc147.bks b/res/raw/leapkeystore_bc147.bks
new file mode 100644
index 00000000..a6eaf30d
--- /dev/null
+++ b/res/raw/leapkeystore_bc147.bks
Binary files differ