summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongkyoon Lee <yeongkyoon.lee@samsung.com>2013-09-26 21:00:57 +0900
committerYeongkyoon Lee <yeongkyoon.lee@samsung.com>2013-09-26 21:01:17 +0900
commit66b12fa8cf5b52ed368203f5fc85f9fcf712deab (patch)
treec38bec0e82c1d09016ebafa9c9e1d6b0b9e2aeeb
parentd348caf10e8e6960de37f7a631dd303217d3e4d0 (diff)
parentb55ff21042d34bb14912b1fb5cb746f7d647374b (diff)
downloademulator-storages-tizen.tar.gz
emulator-storages-tizen.tar.bz2
emulator-storages-tizen.zip
Merge branch 'sdk-develop' into tizenHEADtizen
Conflicts: package/changelog Change-Id: Ib960eb35d1d64522978c71e4fb4da5b8ee321d01
-rw-r--r--.gitignore0
-rw-r--r--package/changelog2
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.gitignore
diff --git a/package/changelog b/package/changelog
index 12dfc1d..2224aa2 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,3 @@
* 1.3.5
-- update version
+- added a build-dependency to use qemu-img.
== Kitae Kim <kt920.kim@samsung.com> 2013-03-15