summaryrefslogtreecommitdiff
path: root/lzo/lzotest/Makefile
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 /lzo/lzotest/Makefile
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 'lzo/lzotest/Makefile')
0 files changed, 0 insertions, 0 deletions