summaryrefslogtreecommitdiff
path: root/packaging/cmake.changes
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-06-27 11:22:48 -0400
committerAnas Nashif <anas.nashif@intel.com>2013-08-13 07:48:34 -0400
commit806125af3f0b187a7daee7596631e35e956728d3 (patch)
tree61592501866570197646efdf5d7ba294335aad5c /packaging/cmake.changes
parent6a5f92af7e5dc6732c6ffe4e1532fd7a6a127d64 (diff)
downloadcmake-806125af3f0b187a7daee7596631e35e956728d3.tar.gz
cmake-806125af3f0b187a7daee7596631e35e956728d3.tar.bz2
cmake-806125af3f0b187a7daee7596631e35e956728d3.zip
add new module for Tizen related directories
Diffstat (limited to 'packaging/cmake.changes')
-rw-r--r--packaging/cmake.changes5
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging/cmake.changes b/packaging/cmake.changes
index 6496fd290..5ff75f8e3 100644
--- a/packaging/cmake.changes
+++ b/packaging/cmake.changes
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
* Fri Jun 14 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.173457@d984652
- Require ncurses-devel for building, not pkgconfig(ncurses)
+=======
+* Thu Jun 27 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.173457@1c276c3
+- add new module for Tizen related directories
+>>>>>>> 1f13767... add new module for Tizen related directories
* Wed Feb 13 2013 Anas Nashif <anas.nashif@intel.com> upstream/2.8.10.2@260abb7
- Update to 2.8.10.2