Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@shliama
shliama committed Jul 24, 2016
2 parents ab75c9d + e45b930 commit 4575f1c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ucrop/src/main/jni/CImag.h linguist-vendored
ucrop/src/main/jni/CImg.h linguist-vendored

0 comments on commit 4575f1c

Please sign in to comment.