bitmask_android.git, branch 0.4 [bitmask_android] Merge branch 'release-0.4' 2014-02-12T21:23:56+00:00 Sean Leonard meanderingcode@aetherislands.net 2014-02-12T21:23:56+00:00 e6149d1d9ef77409e84d5982a92dd727f0bae2f7 






Bump build and version number for release
2014-02-12T21:23:22+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-11T02:41:08+00:00

549bcb62496fbf1f48bfc195716b035c5b6e11e7












changelog
2014-02-12T21:23:14+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-11T02:40:30+00:00

ceab2c90c3d980123008830764b0064ffd1285ba












Remove "RC" from 0.2.3 release notes
2014-02-11T02:33:46+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-11T02:33:46+00:00

2350586292b6a928cf8012adeccd0620a7d9e00c












Bump build and version number for RC2
2014-02-08T00:02:54+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-08T00:02:54+00:00

49f54deb62973b08a363d05e3adcd81335772146












Bump build and version number for RC
2014-02-08T00:01:27+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-05T02:01:21+00:00

be3236a84e9d067a4b09234eaf34504ab0b465b1












Merge branch 'bug/login-logout-messages' into develop
2014-02-07T22:58:19+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-07T22:58:19+00:00

2c9eb75a98927a85f93079b9a78a1826a718b1ea












bugfix for #4664 and #4668 (login/logout messages)
2014-02-07T22:46:37+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-07T22:46:10+00:00

754e15dc7c46981ccc3fe3f5e9dcc14487ddf5bb

Conflicts:
	src/se/leap/bitmaskclient/ProviderAPI.java
	res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e )





Conflicts:
	src/se/leap/bitmaskclient/ProviderAPI.java
	res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e )







Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' into develop
2014-02-05T02:07:16+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-05T02:07:16+00:00

c49e87b8fd272fabc3f674fa8103b455c3bb5304

Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop





Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop







Remove launch log function and click listener from EIP status line.
2014-02-05T02:06:46+00:00

Sean Leonard
meanderingcode@aetherislands.net

2014-02-05T01:56:49+00:00

53be6c97314d2a0c96be8b7c9a3c7e5ae493c901

Log window Activity is gone with ics-openvpn purge.
We will want it back, but we will bring back only what's needed.





Log window Activity is gone with ics-openvpn purge.
We will want it back, but we will bring back only what's needed.