Viewing all changes in revision 6327.
- Committer: André Auzi
- Date: 2013-09-17 19:34:23 UTC
- mfrom: (6319.1.83 midori)
- Revision ID: aauzi@free.fr-20130917193423-j3tqi7tt4b8afu41
merge lp:midori to fix conficts
- files added:
- CMakeLists.txt
- cmake
- config
- data/history
- data/tabby
- files removed:
- data/com.nokia.midori.service
- files renamed:
- data/extensions/ => config/extensions/
- data/search => config/search
- files modified:
- ChangeLog
- tests/potfiles.sh *
expand all
collapse all
added
removed
