From: notaz <notasas@gmail.com>
Date: Mon, 1 Apr 2013 23:10:18 +0000 (+0300)
Subject: Merge branch 'master' into libretro
X-Git-Tag: r24l~952
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b7d708b35f00c17f27133695342f2feb00f5f0;hp=4b5b6cf713480df38c7e79d669cb9e72d70b3ba0;p=pcsx_rearmed.git

Merge branch 'master' into libretro
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e22ef5b3..f916f57a 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -250,7 +250,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
 	memset(info, 0, sizeof(*info));
 	info->library_name = "PCSX-ReARMed";
-	info->library_version = REV;
+	info->library_version = "r19";
 	info->valid_extensions = "bin|cue|img|mdf|pbp|cbn";
 	info->need_fullpath = true;
 }