Remote Control Code : fix merge Conflict
authorChang.H.S <jhs@dev3>
Wed, 28 Sep 2011 08:52:27 +0000 (17:52 +0900)
committerChang.H.S <jhs@dev3>
Wed, 28 Sep 2011 08:52:27 +0000 (17:52 +0900)
commit1a80430c750fbd7e5725a9cfa3c5dd093d20bc79
treea6dc37ce5cf8dc2ba35d8da8838dd7e1e96215bd
parent5a1048279484f56b1db86908e8260b70dfc7bdfb
parent7288e206fc90a44904caed6fd00ec543453bee95
Remote Control Code : fix merge Conflict
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am