Homec4science
Diffusion Genome Privacy - SHCS App 8538d3b8cd7f

Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into…
8538d3b8cd7f
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on Jul 8 2014, 15:28.

Description

Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into mobile_app

Conflicts:
.gitignore
project/PPPClientMobile/AndroidManifest.xml
project/PPPClientMobile/libs/android-support-v4.jar
project/PPPClientMobile/project.properties
project/PPPClientMobile/res/layout/activity_main.xml
project/PPPClientMobile/res/menu/main.xml
project/PPPClientMobile/res/values-v11/styles.xml
project/PPPClientMobile/res/values-v14/styles.xml
project/PPPClientMobile/res/values/strings.xml
project/PPPClientMobile/res/values/styles.xml

Details

Committed
Franck Youssef <franck.youssef@epfl.ch>Jul 8 2014, 15:28
Pushed
raisaroApr 20 2017, 12:42
Parents
R3229:f79e55df52b3: MINOR: cleanup in test app
R3229:42140283e34b: MOBILE: sample app working on device.
Branches
Unknown
Tags
Unknown

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:8538d3b8cd7f: Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into… (authored by Franck Youssef <franck.youssef@epfl.ch>).Jul 8 2014, 15:28

Merged Changes

CommitAuthorDetailsCommitted
f79e55df52b3Franck Youssef
MINOR: cleanup in test app 
Jun 20 2014
2a06312ecc9cFranck Youssef
MAJOR: created sample app for Android 
Jun 20 2014

Changes (24)

Path
A(dir)project/PPPClientMobile/.settings/
Aproject/PPPClientMobile/.settings/org.eclipse.jdt.core.prefs
A(dir)project/PPPClientMobile/bin/
Aproject/PPPClientMobile/bin/AndroidManifest.xml
A(dir)project/PPPClientMobile/gen/ch/epfl/pppclientmobile/
Pproject/PPPClientMobile/gen/ch/epfl/pppclientmobile/BuildConfig.java
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/gen/com/example/genomicprivacy/BuildConfig.java
Aproject/PPPClientMobile/gen/ch/epfl/pppclientmobile/R.java
Pproject/PPPClientMobile/res/layout/activity_login.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/layout/login_main.xml
Pproject/PPPClientMobile/res/menu/login.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/menu/jajajaj.xml
P(dir)project/PPPClientMobile/res/values-large/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-large
Pproject/PPPClientMobile/res/values-large/styles.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-large/styles.xml
P(dir)project/PPPClientMobile/res/values-sw600dp/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw600dp
Pproject/PPPClientMobile/res/values-sw600dp/dimens.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw600dp/dimens.xml
P(dir)project/PPPClientMobile/res/values-sw720dp-land/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw720dp-land
Pproject/PPPClientMobile/res/values-sw720dp-land/dimens.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw720dp-land/dimens.xml
Aproject/PPPClientMobile/res/values/strings_activity_login.xml
Aproject/PPPClientMobile/res/values/strings_activity_settings.xml
A(dir)project/PPPClientMobile/res/xml/
Aproject/PPPClientMobile/res/xml/pref_data_sync.xml
Aproject/PPPClientMobile/res/xml/pref_general.xml
Aproject/PPPClientMobile/res/xml/pref_headers.xml
Aproject/PPPClientMobile/res/xml/pref_notification.xml
A(dir)project/PPPClientMobile/src/ch/epfl/pppclientmobile/
Aproject/PPPClientMobile/src/ch/epfl/pppclientmobile/LoginActivity.java

R3229:8538d3b8cd7f

View Options

project/PPPClientMobile/.settings/org.eclipse.jdt.core.prefs

Loading...
View Options

project/PPPClientMobile/bin/AndroidManifest.xml

Loading...
View Options

project/PPPClientMobile/gen/ch/epfl/pppclientmobile/BuildConfig.java

Loading...
View Options

project/PPPClientMobile/gen/ch/epfl/pppclientmobile/R.java

Loading...
View Options

project/PPPClientMobile/res/layout/activity_login.xml

Loading...
View Options

project/PPPClientMobile/res/menu/login.xml

Loading...
View Options

project/PPPClientMobile/res/values-large/styles.xml

Loading...
View Options

project/PPPClientMobile/res/values-sw600dp/dimens.xml

Loading...
View Options

project/PPPClientMobile/res/values-sw720dp-land/dimens.xml

Loading...
View Options

project/PPPClientMobile/res/values/strings_activity_login.xml

Loading...
View Options

project/PPPClientMobile/res/values/strings_activity_settings.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_data_sync.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_general.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_headers.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_notification.xml

Loading...
View Options

project/PPPClientMobile/src/ch/epfl/pppclientmobile/LoginActivity.java

Loading...
c4science · Help