diff options
author | Anas Nashif <anas.nashif@intel.com> | 2013-06-27 11:22:48 -0400 |
---|---|---|
committer | Anas Nashif <anas.nashif@intel.com> | 2013-06-27 12:08:33 -0400 |
commit | 3e87e2f8377bc6711e33838d24e36ca2c44e8505 (patch) | |
tree | a3ddfbc6f214529003eaf2480b23db62104dd6ea /packaging/cmake.changes | |
parent | 5648e51c20ac023617a354915b9785b1a3b15d3b (diff) | |
download | cmake-efd94609bb5ca7ddeb71641a9c1d970c0dd3cb75.tar.gz cmake-efd94609bb5ca7ddeb71641a9c1d970c0dd3cb75.tar.bz2 cmake-efd94609bb5ca7ddeb71641a9c1d970c0dd3cb75.zip |
add new module for Tizen related directoriessubmit/tizen/20130627.160859accepted/tizen/20130627.232755
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 |