Martin Matuska
|
dedc1ee7fe
|
Merge remote-tracking branch 'upstream/master'
Remove hide ActionBar preference
Conflicts:
AndroidManifest.xml
build.xml
project.properties
res/values/notrans.xml
src/org/connectbot/service/TerminalKeyListener.java
src/sk/vx/connectbot/util/PreferenceConstants.java
|
2012-11-23 09:37:59 +01:00 |