Commit ID c72dce06a55594247cad232d78bec9868f585587
|
Contributor: | Nick Treleaven | Files Modified: | 198 |
| Date: | 04-July-2012 at 11:15 | Lines Added: | 2448 | |
| Repository: | git://github.com/geany/geany.git master | Lines Removed: | 2570 | |
| Commit Comment: | Merge remote-tracking branch 'origin/master' into tm/tree-refactoring Conflicts: makefile.win32 src/makefile.win32 |
|||
| Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|
| C++ | 1714 | 2087 | 126 | 146 | 56 | 75 | |
| C | 186 | 20 | 205 | 196 | 10 | 0 | |
| shell script | 59 | 2 | 15 | 0 | 15 | 0 | |
| HTML | 25 | 17 | 0 | 0 | 0 | 0 | |
| Automake | 14 | 7 | 0 | 0 | 0 | 1 | |
| NSIS | 6 | 3 | 2 | 2 | 1 | 0 | |
| Perl | 5 | 5 | 0 | 0 | 0 | 0 | |
| Autoconf | 2 | 5 | 0 | 0 | 0 | 0 | |
| Vala | 2 | 2 | 0 | 0 | 0 | 0 | |
| D | 2 | 0 | 0 | 0 | 0 | 0 | |
| Ada | 1 | 1 | 0 | 0 | 0 | 0 | |
| Assembly | 1 | 1 | 0 | 0 | 0 | 0 | |
| CSS | 1 | 0 | 0 | 0 | 0 | 0 | |
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|---|
| ChangeLog | No source code was detected in this file. | |||||||
| ChangeLog.pre-1-22 | No source code was detected in this file. | |||||||
| configure.ac | Autoconf | 1 | 1 | 0 | 0 | 0 | 0 | |
| data/colorschemes/alt.conf | No source code was detected in this file. | |||||||
| data/filetypes.ada | Ada | 1 | 1 | 0 | 0 | 0 | 0 | |
| data/filetypes.asm | Assembly | 1 | 1 | 0 | 0 | 0 | 0 | |
| data/filetypes.c | C | 4 | 3 | 0 | 0 | 0 | 0 | |
| data/filetypes.common | No source code was detected in this file. | |||||||
| data/filetypes.cpp | C++ | 2 | 2 | 0 | 0 | 0 | 0 | |
| data/filetypes.css | CSS | 1 | 0 | 0 | 0 | 0 | 0 | |
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.