aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-03-14 01:01:14 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-03-14 01:01:14 +0000
commit5bac2465e7ee4e136ebec0b65f8e52ef8b4df232 (patch)
tree1ccd78f3152c19de6c7f14861b1a7d2d7ae92efa /.gitattributes
parent93c8cd480ea46d49dd7ad1ba9515443797a4a8c1 (diff)
parent19e189ef9ed67f382fea00e48f997ce8e979f030 (diff)
downloadsouthamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar
southamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar.gz
Merge branch 'dev'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d288fed
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+gen/net/cbaines/suma/R.java -diff