~damien-moore/+junk/codeblocks-dly-merge

  • Committer: Damien Moore
  • Date: 2013-12-30 03:17:30 UTC
  • mfrom: (7683.1.81)
  • Revision ID: damienlmoore@gmail.com-20131230031730-5npx3ty3xjrl1bp6
resolve merge conflicts with trunk
Filename Latest Rev Last Changed Committer Comment Size
..
debian 1595 18 years ago mandrav * Added debian folder for .deb creation. Diff
src 2 20 years ago httpd Initial data for the codeblocks project Diff
.gitignore 7087 11 years ago tpetrov - add .cbTemp files to git ignore 424 bytes Diff Download File
acinclude.m4 7683.1.39 10 years ago jenslody * autotools: change configure-script, so "--with-c 24.9 KB Diff Download File
AUTHORS 7199 11 years ago jenslody - sync AUTHORS file with about-box 1.6 KB Diff Download File
File bootstrap 7430 10 years ago jenslody * linux: build fix for older systems, like RedHat/ 2.1 KB Diff Download File
BUGS 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 120 bytes Diff Download File
BUILD 6521 11 years ago mortenmacfly * added EditorConfig plugin 2.9 KB Diff Download File
ChangeLog 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 744 KB Diff Download File
ChangeLog.xsl 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 12.9 KB Diff Download File
codeblocks.pc.in 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 536 bytes Diff Download File
codeblocks.plist.in 7683.1.80 10 years ago mortenmacfly * copied modified features from 13.12 branch back 4 KB Diff Download File
codeblocks.spec.in 7683.1.81 10 years ago jenslody * Change version in spec-file, to include svn-revi 17.2 KB Diff Download File
COMPILERS 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 2.9 KB Diff Download File
configure.ac 7599 10 years ago jenslody * fix incorrect conditional in configure.ac 18.4 KB Diff Download File
COPYING 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 34.3 KB Diff Download File
Makefile.am 7528 10 years ago jenslody * several make dist fixes for the autotools system 573 bytes Diff Download File
NEWS 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 78 bytes Diff Download File
README 7683.1.80 10 years ago mortenmacfly * copied modified features from 13.12 branch back 187 bytes Diff Download File
README.debian 5290 13 years ago mortenmacfly * cc_branch: merged with trunk (trunk to cc_branch 463 bytes Diff Download File
TODO 6126 12 years ago mortenmacfly - svn EOL, type and keyword substitution updates f 40 bytes Diff Download File
update_revision.sh 7700 10 years ago Damien Moore resolve merge conflicts with trunk 2.9 KB Diff Download File
File updateChangeLog.sh 7203 11 years ago biplab * Updated: updateChangeLog.sh script to point to s 1.1 KB Diff Download File