Viewing all changes in revision 24.
- Committer: Jacky Alciné
- Date: 2011-05-03 20:22:13 UTC
- mfrom: (22.1.3 linguistics-devel)
- Revision ID: jackyalcine@gmail.com-20110503202213-j8ys835o3o3ye3th
Fixed conflicts.
- files added:
- CMakeLists.txt
- wntrling-core/include
- wntrling-core/include/wntr
- wntrling-core/include/wntr/ling
- wntrling-core/include/wntr/ling/core
- wntrling-en/include
- wntrling-en/include/wntr
- wntrling-en/include/wntr/ling
- wntrling-en/include/wntr/ling/en
- files removed:
- debian
- debian/source
- files renamed:
- wntrling-core/NEWS => wntrling-core/NEWS.THIS
- wntrling-core/src/parser.hpp => wntrling-core/src/parser.hpp.THIS
- wntrling-core/src/syntax.hpp => wntrling-core/src/syntax.hpp.THIS
- wntrling-core/wintermute-linguistics.pc => wntrling-core/wintermute-linguistics.pc.THIS
- files modified:
- Makefile
expand all
collapse all
added
removed
