Merge branch 'master' of https://github.com/NetEase/Emmagee.git

realcome · Apr 9, 2013 · 9e902d2 · 9e902d2
2 parents ce6af86 + 5ccfe08
commit 9e902d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ you should not miss:
 
 ## How to use Emmagee?
 
-First of all ,you should have Emmagee.apk,download [here](http://emmagee.googlecode.com/files/Emmagee.apk) or 
+First of all ,you should have Emmagee.apk,download [here](http://code.google.com/p/emmagee/downloads/list) or 
 build the apk file youself [here](https://github.com/NetEase/Emmagee/wiki/How-to-build-emmage.apk%3F),then :
 
 1. Start Emmagee App

diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,11 @@
+Emmagee Changelog
+
+###1.1.0 (2013-4-8)
+* Configure specified recipients to receive test reports
+* Automaticly save the result when monitoring app stops
+
+###1.0.0 (2013-1-18)
+* Process-specific monitoring
+* Floating window that renders real-time process status
+* CSV format report that can be converted into any other format you want
+* User-defined collecting interval