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 upstream 0.78 #9

Merged
merged 110 commits into from
Feb 25, 2014
Merged

Merge upstream 0.78 #9

merged 110 commits into from
Feb 25, 2014

Commits on May 4, 2011

  1. Fix typo ("underfined" -> undefined)

    @argv0
    argv0 committed May 4, 2011
    Configuration menu
    Copy the full SHA
    9526590 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master', remote branch 'argv0/patch-1'

    @massemanet
    massemanet committed May 4, 2011
    Configuration menu
    Copy the full SHA
    0f7266a View commit details
    Browse the repository at this point in the history

Commits on May 11, 2011

  1. Relax check on consumers to support parameterised modules.

    @hyperthunk
    hyperthunk committed May 11, 2011
    Configuration menu
    Copy the full SHA
    ff81770 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from hyperthunk/master 

    Relax check on consumers to allow parametrized modules
    @massemanet
    massemanet committed May 11, 2011
    Configuration menu
    Copy the full SHA
    710c110 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2011

  1. changed constants to configs

    mats cronqvist committed Jul 11, 2011
    Configuration menu
    Copy the full SHA
    ba17528 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2011

  1. handle missing info more gracefully in prfPrc

    mats cronqvist committed Aug 26, 2011
    Configuration menu
    Copy the full SHA
    cada5db View commit details
    Browse the repository at this point in the history

  2. handle wildcard module pattern (like a:_(a) )

    mats cronqvist committed Aug 26, 2011
    Configuration menu
    Copy the full SHA
    2be9001 View commit details
    Browse the repository at this point in the history

  3. don't set timer when timeout_release=0

    mats cronqvist committed Aug 26, 2011
    Configuration menu
    Copy the full SHA
    6fd0521 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2011

  1. Don't replace all subscribers with 'ok' just because adding a new one… 

    … fails
    Thomas Järvstrand committed Sep 1, 2011
    Configuration menu
    Copy the full SHA
    2b662e5 View commit details
    Browse the repository at this point in the history

  2. If subscriber key already exists, replace it with {Key, Sub} and not … 

    …just Sub
    Thomas Järvstrand committed Sep 1, 2011
    Configuration menu
    Copy the full SHA
    81a51c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2011

  1. don't tag the process_info tuple twice

    mats cronqvist committed Sep 12, 2011
    Configuration menu
    Copy the full SHA
    49d2a6b View commit details
    Browse the repository at this point in the history

  2. don't tag the process_info tuple twice, correctly

    mats cronqvist committed Sep 12, 2011
    Configuration menu
    Copy the full SHA
    fa82b02 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from ojve/master 

    Don't replace all subscribers with 'ok' just because adding a new one fails
    @massemanet
    massemanet committed Sep 12, 2011
    Configuration menu
    Copy the full SHA
    9042ff8 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2011

  1. Bugfix: sherk_ets:f2t/3 was not tail recursive because of an exceptio… 

    …n handler.
    @esstrifork
    esstrifork committed Oct 5, 2011
    Configuration menu
    Copy the full SHA
    3a21404 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2011

  1. Merge pull request #8 from eriksoe/master 

    sherk_ets:f2t/3 not tail recursive
    @massemanet
    massemanet committed Oct 14, 2011
    Configuration menu
    Copy the full SHA
    54690a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2012

  1. cosmetic

    vagrant committed Apr 27, 2012
    Configuration menu
    Copy the full SHA
    445512f View commit details
    Browse the repository at this point in the history

  2. refactoring printing code. untested, possibly broken

    vagrant committed Apr 27, 2012
    Configuration menu
    Copy the full SHA
    aa66ff6 View commit details
    Browse the repository at this point in the history

  3. refactored printing some more. still untested.

    vagrant committed Apr 27, 2012
    Configuration menu
    Copy the full SHA
    e58009f View commit details
    Browse the repository at this point in the history

  4. messed up the args to io:fwrite...

    vagrant committed Apr 27, 2012
    Configuration menu
    Copy the full SHA
    78ff42a View commit details
    Browse the repository at this point in the history

  5. mixed up 'true and 'false'

    vagrant committed Apr 27, 2012
    Configuration menu
    Copy the full SHA
    6f262b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2012

  1. cosmetic

    mats cronqvist committed Apr 30, 2012
    Configuration menu
    Copy the full SHA
    455c99b View commit details
    Browse the repository at this point in the history

Commits on May 1, 2012

  1. refactored printing. seems to work. 

    fixed the print_calls option.
new option; print_fun.
usage example:
F = fun({Tag,Data,PI,TS})->io:fwrite("~p~n~p~n~p~n~p~n",[Tag,Data,PI,TS])end.
redbug:start("erlang:'++'",[{print_fun,F}]).
    mats cronqvist committed May 1, 2012
    Configuration menu
    Copy the full SHA
    29b5ac0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from massemanet/printer-fix 

    Printer fix
    @massemanet
    massemanet committed May 1, 2012
    Configuration menu
    Copy the full SHA
    c592ef2 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2012

  1. print code bug

    mats cronqvist committed May 30, 2012
    Configuration menu
    Copy the full SHA
    ff23ccd View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2012

  1. redbug:start proplist not handled as a proplist

    mats cronqvist committed Jun 1, 2012
    Configuration menu
    Copy the full SHA
    cc00384 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2012

  1. started getting "exported from case" warnings

    mats cronqvist committed Jun 7, 2012
    Configuration menu
    Copy the full SHA
    dae528e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2012

  1. dtop_replay did not support options 'time', 'delta_time', 'start_time… 

    …' and

'stop_time'.
    mats cronqvist committed Jun 15, 2012
    Configuration menu
    Copy the full SHA
    29edce5 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2012

  1. workaround kernel /proc/self bug

    mats cronqvist committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    16bae32 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2012

  1. dtop_replay can write lines of text inta a table as well as to an fd

    mats cronqvist committed Jul 4, 2012
    Configuration menu
    Copy the full SHA
    18be98a View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2012

  1. more tests

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    8d7a3dc View commit details
    Browse the repository at this point in the history

  2. compiling guard expressions much too simpleminded

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    90daf70 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:massemanet/eper

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    a1debdb View commit details
    Browse the repository at this point in the history

  4. whitespace

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    82b2863 View commit details
    Browse the repository at this point in the history

  5. missing 'debug' flag

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    cf40a7f View commit details
    Browse the repository at this point in the history

  6. nested bifs in guards broken

    mats cronqvist committed Jul 15, 2012
    Configuration menu
    Copy the full SHA
    b0a27ab View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2012

  1. support 'global' tracing (i.e. exported functions only) with "mod:X" … 

    …syntax
    mats cronqvist committed Jul 16, 2012
    Configuration menu
    Copy the full SHA
    2d9c188 View commit details
    Browse the repository at this point in the history

  2. allow "," as action separator

    mats cronqvist committed Jul 16, 2012
    Configuration menu
    Copy the full SHA
    520a77b View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. wrong permission

    mats cronqvist committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    e44b0bc View commit details
    Browse the repository at this point in the history

  2. sherk start script

    mats cronqvist committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    662c49f View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2012

  1. more info messages

    mats cronqvist committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    79e17ad View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2012

  1. fix problem with complex guards, such as: 

    "lists:seq(A, B) when (A == 1) or (A == 3) or (B == 5)"
    Dmitry Russ committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    117ccff View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2012

  1. Merge pull request #12 from liveforeverx/master 

    Version, that I have doesn't accept many guards -> fix it
    @massemanet
    massemanet committed Aug 19, 2012
    Configuration menu
    Copy the full SHA
    d9ae7a8 View commit details
    Browse the repository at this point in the history

  2. more testcases

    mats cronqvist committed Aug 19, 2012
    Configuration menu
    Copy the full SHA
    4e66bd8 View commit details
    Browse the repository at this point in the history

  3. handle disjunct guards 

    I.e. multiple guards separated by ';'. Now handled by substituting ';' with
'orelse'.
    mats cronqvist committed Aug 19, 2012
    Configuration menu
    Copy the full SHA
    44137d3 View commit details
    Browse the repository at this point in the history

  4. cosmetic

    mats cronqvist committed Aug 19, 2012
    Configuration menu
    Copy the full SHA
    4532528 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2012

  1. handle compressed files

    mats cronqvist committed Dec 6, 2012
    Configuration menu
    Copy the full SHA
    00ee08c View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2012

  1. multiple procs

    mats cronqvist committed Dec 7, 2012
    Configuration menu
    Copy the full SHA
    255c577 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:massemanet/eper

    mats cronqvist committed Dec 7, 2012
    Configuration menu
    Copy the full SHA
    b5978e5 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2012

  1. check matches

    mats cronqvist committed Dec 9, 2012
    Configuration menu
    Copy the full SHA
    a7546c2 View commit details
    Browse the repository at this point in the history

  2. vsn 0.62

    mats cronqvist committed Dec 9, 2012
    Configuration menu
    Copy the full SHA
    d8cf28f View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2013

  1. implement the blocking option

    mats cronqvist committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    ab65492 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from massemanet/_blocking 

    implement the blocking option
    @massemanet
    massemanet committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    18d3175 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2013

  1. using the 'blocking' option borked syntax error reporting

    mats cronqvist committed Jan 19, 2013
    Configuration menu
    Copy the full SHA
    9c7be62 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2013

  1. handle disk_log:pid2name/1

    mats cronqvist committed Apr 29, 2013
    Configuration menu
    Copy the full SHA
    a805b24 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2013

  1. bumped version to 0.69

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    9ed38a0 View commit details
    Browse the repository at this point in the history

  2. changed date in license

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    a848417 View commit details
    Browse the repository at this point in the history

  3. added meta target

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    a78758b View commit details
    Browse the repository at this point in the history

  4. ChangeLog mishap

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    7be7b54 View commit details
    Browse the repository at this point in the history

  5. trying to figure out how to generate a ChangeLog file

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    a83963d View commit details
    Browse the repository at this point in the history

  6. doc

    mats cronqvist committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    7122cd5 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2013

  1. remove getopt

    mats cronqvist committed May 3, 2013
    Configuration menu
    Copy the full SHA
    fb9a1ba View commit details
    Browse the repository at this point in the history

  2. Merge pull request massemanet#15 from massemanet/remove-getopt 

    remove getopt
    @massemanet
    massemanet committed May 3, 2013
    Configuration menu
    Copy the full SHA
    a2b075c View commit details
    Browse the repository at this point in the history

Commits on May 7, 2013

  1. whitespace

    mats cronqvist committed May 7, 2013
    Configuration menu
    Copy the full SHA
    8cf87a6 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2013

  1. implement redbug 'print_pids' option

    mats cronqvist committed May 29, 2013
    Configuration menu
    Copy the full SHA
    0a987fe View commit details
    Browse the repository at this point in the history

  2. minor bug fixes

    mats cronqvist committed May 29, 2013
    Configuration menu
    Copy the full SHA
    ea2e1e8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request massemanet#16 from massemanet/redbug_print_pids 

    Redbug print pids
    @massemanet
    massemanet committed May 29, 2013
    Configuration menu
    Copy the full SHA
    58781df View commit details
    Browse the repository at this point in the history

  4. changelog generator

    mats cronqvist committed May 29, 2013
    Configuration menu
    Copy the full SHA
    d63141f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. redbug documentation now documents the current version of redbug.

    mats cronqvist committed May 30, 2013
    Configuration menu
    Copy the full SHA
    35636bc View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2013

  1. documented print_fun

    mats cronqvist committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    5acc472 View commit details
    Browse the repository at this point in the history

  2. fix typo in "buffered" doc

    mats cronqvist committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    312e8df View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2013

  1. disk_log info

    mats cronqvist committed Oct 7, 2013
    Configuration menu
    Copy the full SHA
    5133f50 View commit details
    Browse the repository at this point in the history

  2. Remove print_pid conf. Make default print_fun print pid and regname.

    mats cronqvist committed Oct 7, 2013
    Configuration menu
    Copy the full SHA
    4c68c70 View commit details
    Browse the repository at this point in the history

  3. remove some dead code

    mats cronqvist committed Oct 7, 2013
    Configuration menu
    Copy the full SHA
    edcbd79 View commit details
    Browse the repository at this point in the history

  4. bumped to 0.70

    mats cronqvist committed Oct 7, 2013
    Configuration menu
    Copy the full SHA
    d80eabc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2013

  1. Remove crypto module deprecations 

    When compiling with R16B02 the following deprecation warnings were
encountered:

```
src/prf_crypto.erl:36: Warning: crypto:des_cbc_encrypt/3 is deprecated and will be removed in in a future release; use crypto:block_encrypt/4
src/prf_crypto.erl:43: Warning: crypto:des_cbc_decrypt/3 is deprecated and will be removed in in a future release; use crypto:block_decrypt/4
src/prf_crypto.erl:46: Warning: crypto:md5/1 is deprecated and will be removed in in a future release; use crypto:hash/2
```

Since I use `warnings_as_errors` erlc option I needed to work around these
deprecation warnings for newer versions of Erlang (R16B+). I did this using
a `rebar.config.script` and the Erlang preprocessor's `-ifdef` construct.
Therefore, it should work for previous versions as well as newer versions of
Erlang.

This does make one assumption, an assumption I believe to be "safe", but
worth noting anyway. It assumes that if `crypto:block_encrypt/4` is exported
from the `crypto` module that `crypto:block_decrypt/4` will also be exported.

Happy to amend that shortcut if necessary.
    @mbbx6spp
    mbbx6spp committed Oct 13, 2013
    Configuration menu
    Copy the full SHA
    9365442 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2013

  1. rebar update

    mats cronqvist committed Oct 18, 2013
    Configuration menu
    Copy the full SHA
    5e3943f View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2013

  1. bumped to 0.71

    mats cronqvist committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    cce6685 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2013

  1. phony changelog target

    mats cronqvist committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    33b60a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2013

  1. fix mess I made of susan.potter's patch

    mats cronqvist committed Nov 5, 2013
    Configuration menu
    Copy the full SHA
    28643c5 View commit details
    Browse the repository at this point in the history

  2. version 0.72

    mats cronqvist committed Nov 5, 2013
    Configuration menu
    Copy the full SHA
    11ae389 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2013

  1. reworking of watchdog

    mats cronqvist committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    04cb820 View commit details
    Browse the repository at this point in the history

  2. Merge pull request massemanet#18 from massemanet/watchdog-fixes 

    reworking of watchdog
    @massemanet
    massemanet committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    40bd03f View commit details
    Browse the repository at this point in the history

  3. v0.73

    mats cronqvist committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    af5752a View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2013

  1. fix R16 build error due to typo in rebar.config.script

    mats cronqvist committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    197095c View commit details
    Browse the repository at this point in the history

  2. make make release release

    mats cronqvist committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    ba95437 View commit details
    Browse the repository at this point in the history

  3. fix changelog generation

    mats cronqvist committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    e15a5e6 View commit details
    Browse the repository at this point in the history

  4. v0.74

    mats cronqvist committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    e987415 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2013

  1. make docs

    mats cronqvist committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    29afc2e View commit details
    Browse the repository at this point in the history

  2. new rebar

    mats cronqvist committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    9c55d16 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2013

  1. prfPrc fails to config unless collect is alled first

    mats cronqvist committed Dec 2, 2013
    Configuration menu
    Copy the full SHA
    6293d10 View commit details
    Browse the repository at this point in the history

  2. drop attempt to handle linux 2.4 or older

    mats cronqvist committed Dec 2, 2013
    Configuration menu
    Copy the full SHA
    19fda18 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2013

  1. fix race condition in prfPrc state initializer

    mats cronqvist committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    eee3daa View commit details
    Browse the repository at this point in the history

  2. remove "-import"

    mats cronqvist committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    5048c5d View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2013

  1. adding getopt.erl to quiet xref

    mats cronqvist committed Dec 6, 2013
    Configuration menu
    Copy the full SHA
    8b847d3 View commit details
    Browse the repository at this point in the history

  2. xreffing

    mats cronqvist committed Dec 6, 2013
    Configuration menu
    Copy the full SHA
    2d13ecb View commit details
    Browse the repository at this point in the history

  3. remove broken bread:sax function

    mats cronqvist committed Dec 6, 2013
    Configuration menu
    Copy the full SHA
    2054336 View commit details
    Browse the repository at this point in the history

  4. fix broken watchdog:eunit

    mats cronqvist committed Dec 6, 2013
    Configuration menu
    Copy the full SHA
    3ae6aac View commit details
    Browse the repository at this point in the history

  5. v0.75

    mats cronqvist committed Dec 6, 2013
    Configuration menu
    Copy the full SHA
    2ad3cdc View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2013

  1. cosmetic

    mats cronqvist committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    1bd0d02 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2013

  1. renamed getopt to solve name clash

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    7b57394 View commit details
    Browse the repository at this point in the history

  2. fix redbug print-to-text-file

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    ebc436b View commit details
    Browse the repository at this point in the history

  3. put eper script in priv/bin

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    9e598dd View commit details
    Browse the repository at this point in the history

  4. v0.76

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    bfd00bd View commit details
    Browse the repository at this point in the history

  5. .gitignore priv/bin/eper

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    171efd5 View commit details
    Browse the repository at this point in the history

  6. v0.77

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    5cf62f1 View commit details
    Browse the repository at this point in the history

  7. eunit-ify redbug_msc unit tests

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    7fc126f View commit details
    Browse the repository at this point in the history

  8. add redbug_msc unit tests

    mats cronqvist committed Dec 18, 2013
    Configuration menu
    Copy the full SHA
    f12c231 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2014

  1. fix watchdog:add_send_subscriber(integer(),,,)

    mats cronqvist committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    8477496 View commit details
    Browse the repository at this point in the history

  2. v0.78

    mats cronqvist committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    69364c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2014

  1. Merge branch 'eas-merge-upstream-0.78' into tmp-merged 

    Conflicts:
	Makefile
	rebar
	rebar.config
	rebar.config.script
	src/eper.app.src
	src/prfTrc.erl
	src/prf_crypto.erl
    @engelsanchez
    engelsanchez committed Jan 17, 2014
    Configuration menu
    Copy the full SHA
    c37e33c View commit details
    Browse the repository at this point in the history