[SCM] frysk system monitor/debugger branch, master, updated. 9de39c95de9daba9bffdb74ba37a7fedc52dc50a

[swagiaal@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "frysk system monitor/debugger".

The branch, master has been updated
       via  9de39c95de9daba9bffdb74ba37a7fedc52dc50a (commit)
       via  69eea99c0a89721c200108fc4c360f82fc33e0fc (commit)
      from  1d5c19a29134213e956b21064bb21ea80850d7b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9de39c95de9daba9bffdb74ba37a7fedc52dc50a
Merge: 69eea99c0a89721c200108fc4c360f82fc33e0fc 1d5c19a29134213e956b21064bb21ea80850d7b6
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Fri Oct 26 12:06:43 2007 -0400

    Reloved conflict:
    
    Merge branch 'master' of ssh://sources.redhat.com/git/frysk
    
    Conflicts:
    
    	frysk-core/frysk/debuginfo/ChangeLog

commit 69eea99c0a89721c200108fc4c360f82fc33e0fc
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Fri Oct 26 12:02:33 2007 -0400

    frysk-core/frysk/debuginfo/ChangeLog
    +2007-10-26  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Changed ExprSymTab.getVariable return type to ObjectDeclaration
    +       * TestAddress.java: Updated.
    +       * DebugInfoEvaluator.java: Updated.
    +
    
    frysk-core/frysk/expr/ChangeLog
    +2007-10-26  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * ExprSymTab.java (getVariable): Changed return type
    +       from Variable to ObjectDeclaration
    +       * TestbedSymTab.java: Updated.
    +       * ScratchSymTab.java: Updated.
    +

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    6 ++++++
 frysk-core/frysk/debuginfo/DebugInfoEvaluator.java |    7 ++++---
 frysk-core/frysk/debuginfo/TestAddress.java        |    4 ++--
 frysk-core/frysk/expr/ChangeLog                    |    7 +++++++
 frysk-core/frysk/expr/ExprSymTab.java              |    4 +++-
 frysk-core/frysk/expr/ScratchSymTab.java           |    4 +++-
 frysk-core/frysk/expr/TestbedSymTab.java           |    4 +++-
 7 files changed, 28 insertions(+), 8 deletions(-)


hooks/post-receive
--
frysk system monitor/debugger