SourceForge has been redesigned. Learn more.
Close

Commit [955a9d] master  Maximize  Restore  History

Merge branch 'master' of

ssh://nhnb@arianne.git.sourceforge.net/gitroot/arianne/stendhaldeveloper.git

Conflicts:
src/net/sf/arianne/stendhal/developer/client/AsyncCallbackWithErrorHandling.java
src/net/sf/arianne/stendhal/developer/client/Stendhaldeveloper.java
src/net/sf/arianne/stendhal/developer/client/entity/EntityService.java
src/net/sf/arianne/stendhal/developer/client/entity/EntityServiceAsync.java
src/net/sf/arianne/stendhal/developer/client/fsm/FsmEditor.java
src/net/sf/arianne/stendhal/developer/client/npc/NpcDesigner.java
src/net/sf/arianne/stendhal/developer/client/widget/CommandButtons.java
src/net/sf/arianne/stendhal/developer/server/entity/EntityServiceImpl.java