diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-06-27 12:14:28 -0400 |
|---|---|---|
| committer | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2015-01-06 11:17:16 +0100 |
| commit | 759c8b86c544ba9dfa41f963c5fa7aa4a0180a1d (patch) | |
| tree | e16deb40d7af4bd545537cc192dfccaf2e854891 /packaging/cmake.changes | |
| parent | ffd8a5f251fcd6b9af9b299f9bae682de9a3018c (diff) | |
| download | cmake-759c8b86c544ba9dfa41f963c5fa7aa4a0180a1d.tar.gz cmake-759c8b86c544ba9dfa41f963c5fa7aa4a0180a1d.tar.bz2 cmake-759c8b86c544ba9dfa41f963c5fa7aa4a0180a1d.zip | |
fixed changelog
Diffstat (limited to 'packaging/cmake.changes')
| -rw-r--r-- | packaging/cmake.changes | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/packaging/cmake.changes b/packaging/cmake.changes index 5ff75f8e3..9ca781324 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 |