Skip to content
Permalink
Browse files
Fixes to Makefile.am related to merge of Projections_Branch into HEAD
git-svn-id: http://svn.osgeo.org/qgis/trunk@3115 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Apr 10, 2005
1 parent a69ef09 commit 35a9f976e2b98a80c52d2b459e3101b80ff71086
Showing with 4 additions and 3 deletions.
  1. +3 −0 ChangeLog
  2. +1 −1 configure.in
  3. +0 −2 src/Makefile.am
@@ -2,6 +2,9 @@
------------------------------------------------------------------------------
Version 0.6 'Simon' .... development version
QGIS Change Log
2005-04-09 [ges] 0.6.0devel8
** Fixed problems with the Makefile.am related to the merge of
Projections_Branch into HEAD
2005-04-09 [ges] 0.6.0devel7
** Merged Projections_Branch into HEAD
Problems:
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=6
MICRO_VERSION=0
EXTRA_VERSION=7
EXTRA_VERSION=8
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -503,7 +503,6 @@ libqgis_la_SOURCES = \
qgspointstylewidget.cpp \
qgspointstylewidget.moc.cpp \
qgsprojectproperty.cpp \
qgsprojectproperty.cpp \
qgsprovidercountcalcevent.cpp \
qgsproviderextentcalcevent.cpp \
qgsproviderregistry.cpp \
@@ -512,7 +511,6 @@ libqgis_la_SOURCES = \
qgsrasterlayer.moc.cpp \
qgsrect.cpp \
qgsrenderer.cpp \
qgsrenderer.cpp \
qgsrenderitem.cpp \
qgsrunprocess.cpp \
qgsrunprocess.moc.cpp \

0 comments on commit 35a9f97

Please sign in to comment.