projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69b527c b8b60d8)
Merge branch 'develop' into login_toggle_password_icon
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 May 2013 08:36:21 +0000 (10:36 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 May 2013 08:36:21 +0000 (10:36 +0200)
1  2 
res/layout-land/account_setup.xml patch | diff1 | diff2 | blob | history
res/layout/account_setup.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/authentication/AuthenticatorActivity.java patch | diff1 | diff2 | blob | history

diff --cc res/layout-land/account_setup.xml
Simple merge
diff --cc res/layout/account_setup.xml
Simple merge
ownCloud Android App