diff options
author | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
---|---|---|
committer | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
commit | e8ca2a1ae3259c66991f69d62c470ca611ee4659 (patch) | |
tree | ec743af03426e3beda883a015076c55cf1ff7117 /src/main/.project | |
parent | 5a860416b502833b445f10cea004735910ef0986 (diff) | |
parent | 71bb1e90b0656fe5caa32b34cb5798855d6cc425 (diff) |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
Diffstat (limited to 'src/main/.project')
-rw-r--r-- | src/main/.project | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/main/.project b/src/main/.project new file mode 100644 index 00000000..d2f05ef9 --- /dev/null +++ b/src/main/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ConversationActivity</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
|