summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-06-27 16:14:28 (GMT)
committerAnas Nashif <anas.nashif@intel.com>2013-08-13 11:48:34 (GMT)
commit6ae8059d554b92c0520cac0769a673030c25a12a (patch)
tree6a7a2cb0c53209f79d2f56db4745e77f4d1b0e01
parent806125af3f0b187a7daee7596631e35e956728d3 (diff)
downloadcmake-6ae8059d554b92c0520cac0769a673030c25a12a.zip
cmake-6ae8059d554b92c0520cac0769a673030c25a12a.tar.gz
cmake-6ae8059d554b92c0520cac0769a673030c25a12a.tar.bz2
fixed changelog
-rw-r--r--packaging/cmake.changes5
1 files changed, 0 insertions, 5 deletions
diff --git a/packaging/cmake.changes b/packaging/cmake.changes
index 5ff75f8..9ca7813 100644
--- a/packaging/cmake.changes
+++ b/packaging/cmake.changes
@@ -1,10 +1,5 @@
-<<<<<<< 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