Viewing all changes in revision 2146.
- Committer: Johannes Schmid
- Date: 2011-01-06 11:49:12 UTC
- mfrom: (2120.2.140)
- Revision ID: git-v1:618f2aa85028b80cf9c8c39686024d250c94b88a
Merge branch 'master' into signal-tree-model
Conflicts:
gladeui/glade-app.h
gladeui/glade-signal-editor.c
gladeui/glade-signal.h
gladeui/glade-widget.c
Conflicts:
gladeui/glade-app.h
gladeui/glade-signal-editor.c
gladeui/glade-signal.h
gladeui/glade-widget.c
- files modified:
- ChangeLog
expand all
collapse all
added
removed
