Merge branch 'master' of https://github.com/votchallenge/trax

# Conflicts: # README.md
votchallenge · Mar 6, 2017 · ef79166 · ef79166
2 parents cf4ca89 + 36d9e52
commit ef79166
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -51,15 +51,12 @@ If you are using TraX protocol in your research, please cite the [following publ
 
 ```
 @article{cehovin2017trax,
-author = {{\v{C}}ehovin, Luka},
-doi = {http://dx.doi.org/10.1016/j.neucom.2017.02.036},
-issn = {0925-2312},
-journal = {Neurocomputing},
-keywords = {Algorithm analysis,Communication protocol,
-            Computer vision,Performance evaluation,
-            Software library,Visual tracking},
-title = {{TraX: The visual Tracking eXchange Protocol and Library}},
-year = {2017}
+    author = {{\v{C}}ehovin, Luka},
+    doi = {http://dx.doi.org/10.1016/j.neucom.2017.02.036},
+    issn = {0925-2312},
+    journal = {Neurocomputing},
+    title = {{TraX: The visual Tracking eXchange Protocol and Library}},
+    year = {2017}
 }
 ```
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -17,9 +17,6 @@ If you are using TraX protocol in your research, please cite the `following publ
 		doi = {http://dx.doi.org/10.1016/j.neucom.2017.02.036},
 		issn = {0925-2312},
 		journal = {Neurocomputing},
-		keywords = {Algorithm analysis,Communication protocol,
-			        Computer vision,Performance evaluation,
-			        Software library,Visual tracking},
 		title = {{TraX: The visual Tracking eXchange Protocol and Library}},
 		year = {2017}
 	}