Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master@HEAD #2

Merged
merged 35 commits into from Apr 13, 2014
Merged

Merge master@HEAD #2

merged 35 commits into from Apr 13, 2014

Commits on Apr 4, 2014

  1. Revert "Revert "use POSIX version of esrerror_r"" 

    This reverts commit ecd6ba7.

Conflicts:
	os/FStream.cpp

Because it introduced problems on OSX
Use strerror only, simplify
    @breznak
    breznak committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    15df761 View commit details
    Browse the repository at this point in the history

  2. dummy

    @breznak
    breznak committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    09dc62c View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2014

  1. Doxyfile compliance with new source structure

    @utensil
    utensil committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    4b24bda View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. Minor improvements (beautiful quotes) at Readme file

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    2de24b6 View commit details
    Browse the repository at this point in the history

  2. Fixed 'htmtest' conflicting binary name

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    f213fcd View commit details
    Browse the repository at this point in the history

  3. Fixed 'htmtest' conflicting binary name

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    c478c37 View commit details
    Browse the repository at this point in the history

  4. Fixed 'tests_all' target

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    6ba05f2 View commit details
    Browse the repository at this point in the history

  5. Use 'make' instead of direct call to test binaries

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    ad1362e View commit details
    Browse the repository at this point in the history

  6. Revert "Use 'make' instead of direct call to test binaries"

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    277e7d4 View commit details
    Browse the repository at this point in the history

  7. Force test targets depend of executables are build

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    d14739b View commit details
    Browse the repository at this point in the history

  8. Use 'make' instead of direct call to test binaries

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    cbac03a View commit details
    Browse the repository at this point in the history

  9. Revert "Use 'make' instead of direct call to test binaries"

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    2601576 View commit details
    Browse the repository at this point in the history

  10. Use 'make' instead of direct call to test binaries

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    a6757f6 View commit details
    Browse the repository at this point in the history

  11. Use 'make' instead of direct call to test binaries

    David Ragazzi committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    80f097c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2014

  1. Merge pull request #1 from numenta/master 

    Merge master@HEAD
    @utensil
    utensil committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    d56c1bd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #58 from utensil/issue-57-doxygen-broken 

    Doxyfile compliance with new source structure
    @rhyolight
    rhyolight committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    a5f73b5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from breznak/fix_OSX_fstream 

    Revert "Revert "use POSIX version of esrerror_r""
    @rhyolight
    rhyolight committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    f67dc8b View commit details
    Browse the repository at this point in the history

  4. remove REPOSITORY_DIR from includes 

    use only the **/include/ paths
    @breznak
    breznak committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    1e2a960 View commit details
    Browse the repository at this point in the history

  5. remove autogenerated files 

    (are also in gitignore, just need to be removed from .git)
    @breznak
    breznak committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    ff347e0 View commit details
    Browse the repository at this point in the history

  6. fix #includes

    @breznak
    breznak committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    1f69605 View commit details
    Browse the repository at this point in the history

  7. Replaced $REPOSITORY to $NUPIC_CORE in compliance to README file at N… 

    …upic
    David Ragazzi committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    9ad18b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2014

  1. Replaced NTA_ROOTDIR by NTA

    DavidRagazzi authored and DavidRagazzi committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    75feb26 View commit details
    Browse the repository at this point in the history

  2. add make clean target 

    removes build/release/ and build/temp/ dirs
    @breznak
    breznak committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    d0afaa8 View commit details
    Browse the repository at this point in the history

  3. Readme: mention make clean

    @breznak
    breznak committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    59600ae View commit details
    Browse the repository at this point in the history

  4. do not remove build/temp build/release by default 

    reuse the files at re-compilation. only changed .o will be compiled.
use make clean   to start fresh and compile all -- eg when errors occur.
    @breznak
    breznak committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    866778b View commit details
    Browse the repository at this point in the history

  5. Bye Bye PYTHONPATH

    DavidRagazzi authored and DavidRagazzi committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    44ebd33 View commit details
    Browse the repository at this point in the history

  6. rename to clean-> distclean, fix

    @breznak
    breznak committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    36179d0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into make_clean 

    Conflicts:
	README.md
    @breznak
    breznak committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    4a74ec3 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #65 from breznak/make_clean 

    Make clean & keeping built files
    @rhyolight
    rhyolight committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    e1639fc View commit details
    Browse the repository at this point in the history

  9. Merge pull request #64 from DavidRagazzi/env-variables 

    Replaced NTA_ROOTDIR by NTA and discarded PYTHONPATH
    @rhyolight
    rhyolight committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    36b7678 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #63 from breznak/relative_includes 

    Remove root dir (REPOSITORY_DIR) from include paths
    @rhyolight
    rhyolight committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    59b721a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Add license file

    @rhyolight
    rhyolight committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    5a25785 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #67 from rhyolight/add-license 

    Add license file
    @rhyolight
    rhyolight committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    cb72e08 View commit details
    Browse the repository at this point in the history

  3. Removed GPL instructions from license.

    @rhyolight
    rhyolight committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    b2727fb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #68 from rhyolight/add-license 

    Removed GPL instructions from license.
    @rhyolight
    rhyolight committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    24bdd65 View commit details
    Browse the repository at this point in the history