diff options
Diffstat (limited to 'packaging/cmake.changes')
-rw-r--r-- | packaging/cmake.changes | 5 |
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 |