Skip to content

Commit b463238

Browse files
committed
Merge branch 'release-1.0.1'
2 parents f2af0e1 + 52322a6 commit b463238

17 files changed

+1018
-1043
lines changed

.gitattributes

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
3-
4-
# Custom for Visual Studio
5-
*.cs diff=csharp
6-
7-
# Standard to msysgit
8-
*.doc diff=astextplain
9-
*.DOC diff=astextplain
10-
*.docx diff=astextplain
11-
*.DOCX diff=astextplain
12-
*.dot diff=astextplain
13-
*.DOT diff=astextplain
14-
*.pdf diff=astextplain
15-
*.PDF diff=astextplain
16-
*.rtf diff=astextplain
17-
*.RTF diff=astextplain
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
7+
# Standard to msysgit
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
10+
*.docx diff=astextplain
11+
*.DOCX diff=astextplain
12+
*.dot diff=astextplain
13+
*.DOT diff=astextplain
14+
*.pdf diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain

.gitignore

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
# Windows image file caches
2-
Thumbs.db
3-
ehthumbs.db
4-
5-
# Folder config file
6-
Desktop.ini
7-
8-
# Recycle Bin used on file shares
9-
$RECYCLE.BIN/
10-
11-
# Windows Installer files
12-
*.cab
13-
*.msi
14-
*.msm
15-
*.msp
16-
17-
# Windows shortcuts
18-
*.lnk
19-
20-
# MATLAB autosaves
21-
*.asv
22-
23-
# =========================
24-
# Operating System Files
25-
# =========================
26-
27-
# OSX
28-
# =========================
29-
30-
.DS_Store
31-
.AppleDouble
32-
.LSOverride
33-
34-
# Thumbnails
35-
._*
36-
37-
# Files that might appear in the root of a volume
38-
.DocumentRevisions-V100
39-
.fseventsd
40-
.Spotlight-V100
41-
.TemporaryItems
42-
.Trashes
43-
.VolumeIcon.icns
44-
45-
# Directories potentially created on remote AFP share
46-
.AppleDB
47-
.AppleDesktop
48-
Network Trash Folder
49-
Temporary Items
50-
.apdisk
1+
# Windows image file caches
2+
Thumbs.db
3+
ehthumbs.db
4+
5+
# Folder config file
6+
Desktop.ini
7+
8+
# Recycle Bin used on file shares
9+
$RECYCLE.BIN/
10+
11+
# Windows Installer files
12+
*.cab
13+
*.msi
14+
*.msm
15+
*.msp
16+
17+
# Windows shortcuts
18+
*.lnk
19+
20+
# MATLAB autosaves
21+
*.asv
22+
23+
# =========================
24+
# Operating System Files
25+
# =========================
26+
27+
# OSX
28+
# =========================
29+
30+
.DS_Store
31+
.AppleDouble
32+
.LSOverride
33+
34+
# Thumbnails
35+
._*
36+
37+
# Files that might appear in the root of a volume
38+
.DocumentRevisions-V100
39+
.fseventsd
40+
.Spotlight-V100
41+
.TemporaryItems
42+
.Trashes
43+
.VolumeIcon.icns
44+
45+
# Directories potentially created on remote AFP share
46+
.AppleDB
47+
.AppleDesktop
48+
Network Trash Folder
49+
Temporary Items
50+
.apdisk
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[{000214A0-0000-0000-C000-000000000046}]
2-
Prop3=19,2
3-
[InternetShortcut]
4-
IDList=
5-
URL=http://smm.sagepub.com/content/8/2/135.abstract
6-
HotKey=0
1+
[{000214A0-0000-0000-C000-000000000046}]
2+
Prop3=19,2
3+
[InternetShortcut]
4+
IDList=
5+
URL=http://smm.sagepub.com/content/8/2/135.abstract
6+
HotKey=0

0 commit comments

Comments
 (0)