the-social-notebook-android/.idea
Aran Zaiger fd5c8d5ad3 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
2016-07-10 16:34:29 +03:00
..
copyright Bare Android Project 2016-07-01 14:11:36 +03:00
inspectionProfiles - note display full modified 2016-07-09 01:50:49 +03:00
libraries Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 16:34:29 +03:00
.name Bare Android Project 2016-07-01 14:11:36 +03:00
compiler.xml Bare Android Project 2016-07-01 14:11:36 +03:00
encodings.xml Bare Android Project 2016-07-01 14:11:36 +03:00
gradle.xml added limitation in adding note 2016-07-03 14:32:08 +03:00
misc.xml Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-08 03:20:03 +03:00
modules.xml - added throw button to note_view_full 2016-07-01 17:51:52 +03:00
runConfigurations.xml Bare Android Project 2016-07-01 14:11:36 +03:00
vcs.xml added personalSpaceActivity and Note 2016-07-01 16:34:32 +03:00