Skip to content

Commit

Permalink
Merge remote-tracking branch 'GeoDaCenter/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
lixun910 committed Sep 27, 2018
2 parents 58b08d5 + dfdb211 commit ba87ba8
Show file tree
Hide file tree
Showing 1,200 changed files with 289,994 additions and 359,886 deletions.
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,36 @@
*~

*.deb
*.gwt
*.gal
*.pyc

swig/*.gwt
swig/_geoda.so
swig/geoda.pyc

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/enc_temp_folder/
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 +70,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 +84,17 @@ 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
.vs/slnx.sqlite
BuildTools/temp/CLAPACK-3.1.1-VisualStudio/BLAS/blas.vcproj
Loading

0 comments on commit ba87ba8

Please sign in to comment.