Viewing all changes in revision 1367.
- Committer: Sara Ribeiro
- Date: 2014-03-09 09:52:02 UTC
- mfrom: (1360.2.3 trunk2)
- Revision ID: sara.rmgr@gmail.com-20140309095202-o8ajab32rxl6wr50
Solve merge conflict
- files added:
- requirements.txt
- tests/core
- tests/tools
- files removed:
- GTG/tests
- GTG/tests/xdg
- GTG/tests/xdg/config
- GTG/tests/xdg/config/gtg
- files renamed:
- test/data/ => data/test-data/
- test/ => tests/
- GTG/tests/__init__.py => tests/__init__.py
- GTG/tests/test_search_filter.py => tests/core/test_search_filter.py
- GTG/tests/test_search_query.py => tests/core/test_search_query.py
- GTG/tests/test_tag.py => tests/core/test_tag.py
- GTG/tests/test_dates.py => tests/tools/test_dates.py
- GTG/tests/test_interruptible.py => tests/tools/test_interruptible.py
- GTG/tests/test_networkmanager.py => tests/tools/test_networkmanager.py
- GTG/tests/test_urlregex.py => tests/tools/test_urlregex.py
- files modified:
- CHANGELOG
expand all
collapse all
added
removed
