0
0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Anki-Android/.idea
nobnago d089a775be Merge branch 'develop' of https://github.com/ankidroid/Anki-Android into develop
Conflicts:
	AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java
	AnkiDroid/src/main/res/layout/deck_item.xml
2015-03-30 11:32:00 +02:00
..
copyright Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
scopes Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
.name Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
compiler.xml Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
encodings.xml Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
gradle.xml Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00
misc.xml Merge branch 'develop' of https://github.com/ankidroid/Anki-Android into develop 2015-03-30 11:32:00 +02:00
vcs.xml Migrate to new Android Studio project structure 2014-11-10 02:02:29 +09:00