Merge branch 'tinyurl'

Conflicts:
	src/command.c

1 files changed, 25 insertions, 0 deletions

diff --git a/src/tinyurl.h b/src/tinyurl.h
new file mode 100644
index 00000000..7c958d7a
--- /dev/null
+++ b/src/tinyurl.h
@@ -0,0 +1,25 @@
+/* 
+ * tinyurl.h
+ *
+ * Copyright (C) 2012 James Booth <boothj5@gmail.com>
+ * 
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+void tinyurl_init(void);
+gboolean tinyurl_valid(char *url);
+char * tinyurl_get(char *url);