Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	src/mapserver/qgswmsserver.cpp
  • Loading branch information
Marcel Dancak committed Apr 7, 2014
2 parents d60e7dc + 9de505d commit e8d1af9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit e8d1af9

Please sign in to comment.