OSDN Git Service

Merge commit 'remotes/korg/cupcake'
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:58:19 +0000 (07:58 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:58:19 +0000 (07:58 -0800)
commit179d2bf01ac59314cafc185fa339c3b905098550
treece2ec038ef11b2f7c2766fae66d31e03d449bf20
parentd1fa901ebb59a5042e9597d8975689919363770d
parentdcc08f073b6873c69ab891d4f69f7c568e282df7
Merge commit 'remotes/korg/cupcake'

Conflicts:
core/api/1.xml
core/api/current.xml
core/main.mk
core/main.mk
core/tasks/apicheck.mk
tools/atree/files.cpp