summaryrefslogtreecommitdiffstats
path: root/license.txt
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-27 19:59:44 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-27 19:59:44 +0100
commit7e75bf88ccaee5829ac8711fee944182e4dce57f (patch)
treec778a84810199b93a9b4335366038fec3ce030d8 /license.txt
parent65571d9d9684573887dc4a481b44f33b13584059 (diff)
parent0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-issue-128
Diffstat (limited to 'license.txt')
0 files changed, 0 insertions, 0 deletions