akwizgran 9bb298ed44 Merge branch '174-bsp-renaming-again' ...

Conflicts:
	briar-android/src/org/briarproject/android/contact/ConversationActivity.java

2015-12-16 10:42:44 +00:00

..

artwork

Show current step and total number of steps when adding a contact.

2015-12-14 15:02:04 -02:00

assets

Upgraded Tor to 0.2.7.5 with OpenSSL 1.0.2e. #148

2015-12-03 21:46:16 +00:00

libs

Added AppCompatBar and fixed dependencies

2015-12-14 14:03:55 +01:00

res

Merge branch '174-bsp-renaming'

2015-12-16 10:39:16 +00:00

src/org/briarproject

Merge branch '174-bsp-renaming-again'

2015-12-16 10:42:44 +00:00

.classpath

Upgraded Spongy Castle to 1.53, fixed tests. #146

2015-12-03 11:12:16 +00:00

.gitignore

Added Gradle build files because Ant's too efficient for some people.

2014-11-25 14:54:34 +00:00

.project

undo unnecessary changes to .project file and ignore eclipse metadata

2014-12-22 21:11:16 +03:00

AndroidManifest.xml

Use 'forum' instead of 'group'. #174

2015-12-15 13:23:52 +00:00

ant.properties

Updated ant build files for multi-project structure.

2012-12-05 23:15:35 +00:00

build.gradle

Added AppCompatBar and fixed dependencies

2015-12-14 14:03:55 +01:00

build.xml

Separated Android code and core code into distinct Eclipse projects.

2012-12-05 20:39:31 +00:00

custom_rules.xml

Updated ant build files for multi-project structure.

2012-12-05 23:15:35 +00:00

lint.xml

Separated Android code and core code into distinct Eclipse projects.

2012-12-05 20:39:31 +00:00

proguard-project.txt

Separated Android code and core code into distinct Eclipse projects.

2012-12-05 20:39:31 +00:00

project.properties

Use JDK 1.7, target Android 5.1.

2015-04-03 20:56:01 +01:00