summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2011-08-23 12:31:29 -0700
committerAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2011-08-23 12:31:53 -0700
commit14a2ea14cd2cd0c379370e27aeef9b6cfbfd02be (patch)
tree075e80a86b92ec66e50d08d590a2a4ddba138e2a /ChangeLog
parent25fa17d016015fab670ebcdd039b6383bdacc756 (diff)
parenta0e5c7e3f16a40d05cbfbb1893bd81155fd3bf14 (diff)
Merge branch 'finalmerge'HEADmaster
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions