summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-marshal.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
committerStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
commitdc66bc40724191f0068869773576dc4edf042c6f (patch)
tree74b9684feea188736b21f2c829f29befaaf2e9da /libcaja-private/caja-marshal.c
parent935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent1466df20591105550738a1d0784a623af9909abf (diff)
downloadcaja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'libcaja-private/caja-marshal.c')
-rw-r--r--libcaja-private/caja-marshal.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libcaja-private/caja-marshal.c b/libcaja-private/caja-marshal.c
deleted file mode 100644
index 59c9ddcc..00000000
--- a/libcaja-private/caja-marshal.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "caja-marshal.h"
-#include "caja-marshal-guts.c"