Skip to content
Permalink
Browse files

Fix some more merge confglicts after merging updates from 1.7 brnach

  • Loading branch information
timlinux committed Sep 24, 2011
1 parent 08d8ea2 commit 93a190a38210c508617ae0da2a8faacf0bf806b3
Showing with 2,497 additions and 1,488 deletions.
  1. +1,248 −737 CHANGELOG
  2. +1,248 −737 ChangeLog
  3. +1 −1 doc/CMakeLists.txt
  4. +0 −13 src/app/qgisapp.cpp

0 comments on commit 93a190a

Please sign in to comment.
You can’t perform that action at this time.