review.tizen.org Git - tools/mic.git/commit

projects / tools / mic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aaee947 a425360)

author	Gui Chen <gui.chen@intel.com>
	Wed, 19 Dec 2012 06:42:48 +0000 (14:42 +0800)
committer	Gui Chen <gui.chen@intel.com>
	Wed, 19 Dec 2012 06:42:48 +0000 (14:42 +0800)
commit	f20bfb944246f5f6f89963d1f41f32ac6dc19acf
tree	0767057396e10d42fc5ba4214546c903f4bae6fb	tree \| snapshot
parent	aaee947d5ad2c0efdbcb270346c5176647686c88	commit \| diff
parent	a4253604bfc4c6e35085e0f74580ac09c4a55fc1	commit \| diff

Merge branch 'release-0.15' into devel

Conflicts:
etc/bootstrap.conf
mic/bootstrap.py
mic/creator.py
mic/imager/raw.py
mic/msger.py
mic/utils/misc.py
setup.py

Signed-off-by: Gui Chen <gui.chen@intel.com>

etc/mic.conf.in	diff1 \|	diff2 \|	blob \| history
mic/creator.py	diff1 \|	diff2 \|	blob \| history
mic/utils/misc.py	diff1 \|	diff2 \|	blob \| history
packaging/mic.spec	diff1 \|	diff2 \|	blob \| history
plugins/imager/fs_plugin.py	diff1 \|	diff2 \|	blob \| history
plugins/imager/livecd_plugin.py	diff1 \|	diff2 \|	blob \| history
plugins/imager/liveusb_plugin.py	diff1 \|	diff2 \|	blob \| history
plugins/imager/loop_plugin.py	diff1 \|	diff2 \|	blob \| history
plugins/imager/raw_plugin.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history

Domain: SCM / Build;