projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5627b4 ff36d90)
Merge branch 'fragments-ui' of
authorLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
commit51302a638677b16c5faac6242da44080794f537e
tree878febc3464c970c3e42327bb77fedf9909f1867tree | snapshot (tar.gz tar.bz2 zip)
parentd5627b41653ee1549e23116fc6a90a1725d62fbacommit | diff
parentff36d908024994abe425351ba4f01b9cf805d1e3commit | diff
Merge branch 'fragments-ui' of
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
src/eu/alefzero/owncloud/datamodel/OCFile.java
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java diff1 | diff2 | blob | history
ownCloud Android App