Michael Kamensky d491972995 Merge branch 'master' into 'master' ...

Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283

2019-02-07 05:54:47 +00:00

..

main/java/forge

Merge branch 'master' into 'master'

2019-02-07 05:54:47 +00:00

test/java

Fixes some compile errors in Eclipse due to empty folders.

2018-04-17 15:50:53 -07:00