diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-06-27 11:22:48 -0400 |
|---|---|---|
| committer | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2015-01-06 11:17:16 +0100 |
| commit | ffd8a5f251fcd6b9af9b299f9bae682de9a3018c (patch) | |
| tree | 1399af9921b897f1e49ce75566f6fa6fbc30cd8c /packaging/cmake.changes | |
| parent | 9116bfa2305268a561d170bbd87f72aa3dec42a7 (diff) | |
| download | cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.tar.gz cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.tar.bz2 cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.zip | |
add new module for Tizen related directories
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 |