summaryrefslogtreecommitdiff
path: root/Aktywator/Properties/Resources.resx
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-08-01 00:58:24 +0200
committeremkael <emkael@tlen.pl>2017-08-01 00:58:24 +0200
commit9c8f4d17d02e3f8121d298326115679663165310 (patch)
treec411aaf5fd946e238943a4dc6a9bc53e9e6eb80c /Aktywator/Properties/Resources.resx
parentea9027a8e624cc6d0ef193189bf1d7b1e0e13724 (diff)
parente8e3274d55d7bf325d2360bfc4be3eb0b09c8cc7 (diff)
Merge branch 'master' into rrb-names
Conflicts: Aktywator.txt Aktywator/MainForm.Designer.cs Aktywator/MainForm.cs
Diffstat (limited to 'Aktywator/Properties/Resources.resx')
0 files changed, 0 insertions, 0 deletions