Commit ID 300a5b751f2845a6bdf8308333669f10cebf7271
|
|
Contributor: | gravitystorm as Andy Allan |
Files Modified: | 185 |
| Date: | 24-March-2012 at 11:42 | Lines Added: | 2581 | |
| Repository: | git://git.openstreetmap.org/potlatch2.git master | Lines Removed: | 642 | |
| Commit Comment: | Merge branch 'master' into history Conflicts: net/systemeD/halcyon/connection/Entity.as net/systemeD/halcyon/connection/XMLBaseConnection.as net/systemeD/halcyon/connection/XMLConnection.as net/systemeD/potlatch2/TagViewer.mxml net/systemeD/potlatch2/controller/ControllerState.as |
|||
| Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|
| ActionScript | 1007 | 253 | 199 | 41 | 152 | 12 | |
| MXML | 775 | 188 | 95 | 4 | 84 | 6 | |
| XML | 136 | 98 | 3 | 3 | 6 | 4 | |
| HTML | 49 | 21 | 0 | 0 | 6 | 0 | |
| CSS | 47 | 11 | 5 | 1 | 17 | 0 | |
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|---|
| build.properties.template | No source code was detected in this file. | |||||||
| build.xml | XML | 56 | 28 | 1 | 0 | 1 | 0 | |
| embedded/delete.svg | No source code was detected in this file. | |||||||
| embedded/multipolygon.svg | No source code was detected in this file. | |||||||
| embedded/tab_transport.png | No source code was detected in this file. | |||||||
| halcyon_viewer.as | ActionScript | 18 | 10 | 6 | 1 | 3 | 0 | |
| halcyon_viewer-config.xml | XML | 1 | 0 | 0 | 0 | 2 | 0 | |
| l10n/locale/ast/help_dialog.properties | No source code was detected in this file. | |||||||
| l10n/locale/ast/p2_main.properties | No source code was detected in this file. | |||||||
| l10n/locale/br/help_dialog.properties | No source code was detected in this file. | |||||||
Copyright
©
2013
Black Duck Software, Inc.
and its contributors, Some Rights Reserved. Unless otherwise marked, this work is licensed under a
Creative Commons Attribution 3.0 Unported License
. Ohloh
®
and the Ohloh logo are trademarks of
Black Duck Software, Inc.
in the United States and/or other jurisdictions. All other trademarks are the property of their respective holders.