-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge develop to master for 2.1 release
- Loading branch information
Showing
24 changed files
with
1,268 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,10 @@ | ||
WEB-INF/* | ||
litepost/* | ||
mxunit/* | ||
.project | ||
settings.xml | ||
.settings/org.eclipse.core.resources.prefs | ||
.settings/org.eclipse.core.resources.prefs | ||
# Intellij IDEA files | ||
*.iml | ||
*.ipr | ||
*.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
This FW/1 directory is a complete web application and expects to live in its own webroot | ||
if you plan to run the applications within it. To use FW/1 in a separate webroot you can | ||
either copy the org directory to that webroot or add a mapping for /org/corfield to the | ||
corfield folder inside the org directory (or a /org mapping to the org directory directly). | ||
This FW/1 directory is a complete web application and expects to live in its own | ||
webroot if you plan to run the applications within it. To use FW/1 in a separate | ||
webroot you can either copy the org directory to that webroot or add a mapping | ||
for /org/corfield to the corfield folder inside the org directory (or a /org | ||
mapping to the org directory directly). | ||
|
||
Project home: http://fw1.riaforge.org | ||
|
||
Documentation wiki: http://github.com/seancorfield/fw1/wiki | ||
|
||
Blog: http://corfield.org/blog/archives.cfm/category/fw1 | ||
|
||
Support: http://groups.google.com/group/framework-one/ | ||
Support: http://groups.google.com/group/framework-one/ |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.