projects
/
sdk
/
emulator
/
emulator-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
605200a
41df8be
)
Merge "VM property: Modified last-created VM property." into develop
author
Sangho Park
<sangho1206.park@samsung.com>
Wed, 20 May 2015 10:23:30 +0000
(19:23 +0900)
committer
Gerrit Code Review
<gerrit@tizensrc>
Wed, 20 May 2015 10:23:30 +0000
(19:23 +0900)
1
2
src/org/tizen/emulator/manager/platform/Profile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/org/tizen/emulator/manager/platform/ProfileList.java
patch
|
diff1
|
diff2
|
blob
|
history
src/org/tizen/emulator/manager/vms/VMProperty.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/org/tizen/emulator/manager/platform/Profile.java
Simple merge
diff --cc
src/org/tizen/emulator/manager/platform/ProfileList.java
Simple merge
diff --cc
src/org/tizen/emulator/manager/vms/VMProperty.java
index
19a2aa7
,
edb732e
..
3544d63
---
1
/
src/org/tizen/emulator/manager/vms/VMProperty.java
---
2
/
src/org/tizen/emulator/manager/vms/VMProperty.java
+++ b/
src/org/tizen/emulator/manager/vms/VMProperty.java
@@@
-274,4
-293,4
+293,4
@@@
public class VMProperty
}
};
--}
++}