diff options
author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2013-02-18 18:31:23 +0100 |
---|---|---|
committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2013-02-18 18:31:23 +0100 |
commit | 7deec52e8feb1c908a91224f308e8cbd9a170576 (patch) | |
tree | c8fb09523f5fef8873bd921da000d42ad5e59b6f /Makefile.am | |
parent | b89fd90083b22e6d4ab469af001a1f15fbcd7da9 (diff) | |
parent | c17d9c23d023a5c08656376944f636180f0a437b (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 38a9f83d..e017fba7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,8 @@ SUBDIRS = \ utils \ mteval \ klm/util/double-conversion \ - klm/util/stream \ klm/util \ + klm/util/stream \ klm/lm \ klm/lm/builder \ klm/search \ |