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-06-27 16:14:28 (GMT)
commit5b79aa9d23959258236c10ea6c7fcb7267ab9a3c (patch)
treee73d25341e8937dd51113a5e4c9c4094ffbbd1fd
parent3e87e2f8377bc6711e33838d24e36ca2c44e8505 (diff)
downloadcmake-5b79aa9d23959258236c10ea6c7fcb7267ab9a3c.zip
cmake-5b79aa9d23959258236c10ea6c7fcb7267ab9a3c.tar.gz
cmake-5b79aa9d23959258236c10ea6c7fcb7267ab9a3c.tar.bz2
-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