summaryrefslogtreecommitdiff
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-14 17:00:45 +0200
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-14 17:00:45 +0200
commitfb42639b433d2fc0c68f300666be1192dc3b4f59 (patch)
treebbce7fffa8c28ade217cf331e357ba65e64235b3 /LICENSE.txt
parent670a8f984fc6d8342180c59ae9e96b0b76f34d3d (diff)
parent0f1e696690b18259acd79c3469d00a72aca00161 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions