Skip to content

Commit

Permalink
Merge pull request #637 from lixun910/master
Browse files Browse the repository at this point in the history
GeoDa 1.8.16 merge with Master
  • Loading branch information
lixun910 committed Mar 6, 2017
2 parents fcad9c6 + 94c4796 commit 55ae016
Show file tree
Hide file tree
Showing 430 changed files with 127,689 additions and 35,166 deletions.
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
*~

*.deb

BuildTools/centos/libraries/
BuildTools/centos/temp/
BuildTools/centos/build/

BuildTools/ubuntu/libraries/
BuildTools/ubuntu/temp/
BuildTools/ubuntu/product/
BuildTools/ubuntu/build/

BuildTools/windows/.vs/
BuildTools/windows/temp/
BuildTools/windows/Debug/
BuildTools/windows/Release/
BuildTools/windows/ipch/
BuildTools/windows/GeoDa.vcxproj.filters
BuildTools/macosx/libraries/
BuildTools/macosx/libraries1/
BuildTools/macosx/libraries108/
BuildTools/macosx/temp/
BuildTools/macosx/temp1/
BuildTools/macosx/temp108/
BuildTools/macosx/build/
BuildTools/macosx/GeoDa.xcodeproj/
BuildTools/macosx/GeoDa.xcodeproj/xcuserdata/
Expand Down Expand Up @@ -47,6 +62,8 @@ BuildTools/macosx/GeoDa.xcodeproj/project.xcworkspace/xcuserdata/xun.xcuserdatad

*.xcuserstate

rc/GdaAppResources.cpp$*

rc/Drop-Files-Here-extra.png

rc/Drop-Files-Here-extra-black.png
Expand All @@ -59,3 +76,15 @@ BuildTools/.DS_Store
.DS_Store

*.DS_Store

BuildTools/macosx/libraries.zip
BuildTools/windows/oldlogger.txt

*.o


BuildTools/macosx/temp1/boost_1_57_0/b2

*.xcworkspacedata

*.plist
Binary file added BuildTools/CommonDistFiles/GeoDa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified BuildTools/CommonDistFiles/cache.sqlite
Binary file not shown.
138 changes: 138 additions & 0 deletions BuildTools/CommonDistFiles/gdaldata/GDALLogoBW.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 55ae016

Please sign in to comment.