projects / profile / ivi / wrt-plugins-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9e22e4 0f9b2c5)
Merge branch 'tizen' into mediaserver
authorLuc Yriarte <luc.yriarte@intel.com>
Wed, 17 Jul 2013 20:03:24 +0000 (22:03 +0200)
committerLuc Yriarte <luc.yriarte@intel.com>
Wed, 17 Jul 2013 20:03:24 +0000 (22:03 +0200)
1  2 
packaging/wrt-plugin-ivi.spec patch | diff1 | diff2 | blob | history
src/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc packaging/wrt-plugin-ivi.spec
Simple merge
diff --cc src/CMakeLists.txt
index ba21fae,b7f1ca4..ba21fae
mode 100755,100644..100644
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
Domain: Web Framework / Uncategorized;