projects / platform / upstream / cmake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffd8a5f)
fixed changelog
authorAnas Nashif <anas.nashif@intel.com>
Thu, 27 Jun 2013 16:14:28 +0000 (12:14 -0400)
committerPhilippe Coval <philippe.coval@open.eurogiciel.org>
Tue, 6 Jan 2015 10:17:16 +0000 (11:17 +0100)
packaging/cmake.changes patch | blob | history

diff --git a/packaging/cmake.changes b/packaging/cmake.changes
index 5ff75f8..9ca7813 100644 (file)
--- 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
Domain: System / Base;