forge

mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00

Go to file

Michael Kamensky a6c3a642f8 Merge branch 'patch-3' into 'master'

Update demigod_of_revenge.txt

See merge request core-developers/forge!514

2018-05-02 03:34:25 +00:00

.settings

Normalize line endings

2017-12-28 23:40:29 -05:00

forge-ai

- Style fix related to the previous merge.

2018-04-30 19:59:36 +03:00

forge-core

Merge branch 'temp_dev5' into 'master'

2018-04-30 00:16:30 +00:00

forge-game

Merge branch 'saga2' into 'master'

2018-04-30 06:24:17 +00:00

forge-gui

Merge branch 'patch-3' into 'master'

2018-05-02 03:34:25 +00:00

forge-gui-android

Proposal to fix Android warnings.

2018-04-28 17:28:16 +00:00

forge-gui-desktop

Merge branch 'dev-mode' into 'master'

2018-04-30 00:17:43 +00:00

forge-gui-ios

- Preparing Forge for Android publish 1.6.9.005 [hotfix].

2018-04-26 07:36:04 +03:00

forge-gui-mobile

Merge branch 'dev-mode' into 'master'

2018-04-30 00:17:43 +00:00

forge-gui-mobile-dev

[maven-release-plugin] prepare for next development iteration

2018-04-21 01:18:35 +00:00

.checkstyle

In Eclipse, turn on CheckStyle plugin checks for any file opened in the editor, even if it is already in synch with the repository.

2011-08-28 13:42:22 +00:00

.classpath

fix eclipse issues

2013-11-08 18:39:59 +00:00

.fbprefs

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitattributes

Normalize line endings

2017-12-28 23:40:29 -05:00

.gitignore

Update CHANGES.txt for release 1.5.57.

2016-10-27 02:43:15 +00:00

.project

- Reverted accidental commit of project file.

2014-11-01 14:40:31 +00:00

AppIcon.png

Work towards getting Android app to run

2014-04-23 22:02:51 +00:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2018-04-21 01:18:35 +00:00