labofsahil/github-event-dataset-2012 huggingface dataset:
added new strings for the preferences editor
added strings for the language names
Resources_fr.po: Translate language list

Grab language translations from http://pkg-isocodes.alioth.debian.org/
Msgmerge did reformat some msgstr.
Modify the "Open..." translation.
Fix some whitespaces.
added Russian
Merge pull request #43 from dbarbier/fr_translation

Resources_fr.po: Translate language list
Merge branch 'master' of https://github.com/arduino/IDE_translations
minor changes in the tagalog translation
Merge pull request #44 from mharkus/master

Added more strings minor changes in the tagalog translation
news strings releated to Languages features translated!
Added twitter bootstrap
Using only one app layout avoiding duplication of code
Content was missing in post
Skins: cosmetics
Built-In Variables: filled in gaps.
Tips: Fixed end links
Added gitignore and htaccess files
UPdated gitignore
Rebuild DSL and brought spec coverage up as high as it can go.
fix squarespace blog
removed the passenger and rails
Better unicorn config file
Bundle
Gemfile.lock
Recuerda: haz backup... recuerda... recuerda
Comunidad
Merge branch 'master' of github.com:recortable/Masqueunacasa

* 'master' of github.com:recortable/Masqueunacasa:
  Destroy tables users and groups
added basic menuing, some layout tweeks to result entry page
completely redesigned the website's design and added the blog page
Got to a decent point in the app that has plants that can be edited/added for user
Removido arquivo TODO pois optei por usar o issue tracker do github
Cropping for broadcast is almost working.
Thumbnail is working for broadcast.
Tinymce save fixed.
Sorting for posts fixed.
Added rightscale_account to yaml file.
Moved SSL certificate stuff to /etc/spidermonkey
Update locales
Fix lazaret unit tests pathfiles
Fix #786 Update baskets transfer
Remove unused package annotation
Finish validate email uniqueness in User Class
Rebase from 'release/roswtf' @ version '1.9.39'
Generated debian files for oneiric
Rebase from release/rosmsg
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.19
Rebase from 'release/rosout' @ version '1.9.28'
Generated debian files for precise
Rebase from 'release/test_roslib_comm' @ version '1.9.39'
Generated debian files for oneiric
Rebase from 'release/rosout' @ version '1.9.36'
Generated debian files for quantal
add yii and change main view
change the input styles
added extra exclusions
Added week three files to the repository

rename-me.js
project3.html
sdi.css
requerimientos y config para postgre
update requirements (nose)
update requirements (nose)
probando
probando con otro puerto
soporte para variables de entorno de heroku
conector postgre
update requirements (psycopg2)
update requirements
excluir .idea folder
persistencia de postulacion
refactoring modelo, formulario y listado en orden
refactoring modelo y vistar, paginador, macros, etc
paginas estaticas
tagging
sistema de tags medio cabeza
tags en listado, formulario de busqueda
autocompletar tags y estilos jquery-ui
ajuste autocompletar
cambios textos home
added debian folder, can now be built as a debian package
more rwboyer blog fooling around
Made source datastreams more general
resetting master
updated site @ 2012-04-18 21:58:47
Removing docs again as github does not display them as HTML anyway.
remove comic post
VS12 changes
Added Axis labels
Completed post about Arduino and thermistors

It's the post Charlie requested about the electronics side
Fixed imports and streamlined rst ext case check

- Fixed import order to comply with standards (I hope I got it right)
- Use .lower to convert .rst file extension case to lower case for
  better code readability
Clean document
Use ActiveSupport::Deprecation.warn instead of deprecate, deprecate is not ready to use by libraries
Created Factory and Generator classes for SqlServer2012

Set up the structure needed to add Sql Server 2012 specfic changes
to FluentMigrator. At the moment, functionality is exactly the same
as Sql Server 2008.
Add Create and Drop Sequence to Sql Server 2012 Generator

New test class for SqlServer2012Generator and can generate sql for the
CreateSequenceExpression and DeleteSequenceExpression.
Integration tests for SqlServer2012

These are exactly the same as for Sql Server 2008 and 2005. Might add
integration tests for Create Sequence if it doesn't cause problems for
other committers.
Updated Nuget exe so that rake script can build
Add license regions to SqlServer2012 files
Merge pull request #313 from daniellee/sqlserver2012

Support for Sqlserver2012
Site updated at 2012-07-07 11:55:50 UTC
Adds configuration options.

Adds configuration options that lets users choose which fields to use for item
title, date, and description.

Adds helper functions for dealing with configuration options.

Adds tests for checking the setting of these options.

Updates the translation template to account for new strings in the
configuration form.

Adds an upgrade check to add default options.
bugfix /remove
Allowing for connections to local host

The local host cannot be connected to with a username and password.
Previous code didn't account for this and so the connection failed.

Now wrapped connection code in a try...catch block.  If the initial
connection fails with an error code indicating a localhost error, then
the connection is attempted again with a null username and password.
unit: give name to posts_to_pages connection type
Changed rename and deleteResource to use defer in server, and refactored
into withBaseDir in filesystem.js
upgrade jersey-client to version 1.12
generated js
cleaned Cakefile
added ioctl call to print active monitor list
Added gems for project
Merge branch 'master' into add-gems

Conflicts:
	Gemfile
	Gemfile.lock
Add compass_twitter_bootstrap, knockoutjs
Merged branch add-gems
Use most recent pre-release of clj-webdriver
Ignore webdriver output for Chrome
Remove previous failed attempt, add first *real* relation
Add start of examples area
Upgraded to MVC4, Admin area starts taking shape
Returned back passing the Context to PodcastPlayer
Upgraded to Robotium 3.1, fixed failing tests
Introduced PodcastListDriver, moved drivers into the dedicated package
Implemented the acceptance test for downloading podcast
Renamed accidental ListActivity -> PodcastListActivity
Introduce PodcastSelectionHandler
PodcastSelectionHandler shows the action dialog
Improved acceptance test stability; introduced basic structure for podcast downloading
Tests for DownloadManager
Implemented an accept test (failing) for downloading podcast that is closer to the hardware
Created a unit test suite for PodcastDownloader, but stuck with binding to android Uri implementation
Removed using android.Uri class in PodcastItem, so that unit tests may be isolated from the platform
Implemented PodcastDownloader functionality
Podcasts get downloaded
Moved TODO file
Package 'download'
Introduced DownloadFolder abstraction
Created an acceptance test for platform that does not support download manager
Created the fake podcast downloader, but acc test fails because of incorrect activity creation
Created the fake podcast downloader, but acc test fails because of incorrect activity creation
Adding navigation buttons and settings page
minor bugfix in the deletion of files and POI data
minor ui tweak and bugfix to the about activity
minor bugfix to the layout of the new poi screen
minor bugfix in lookup of contacts and send messages in peer info activity
fix a formating bug in the display of times over an hour
rename the drawable for styling buttons
minor bugfix
ensure lists of files from directories are in alphabetical order
make Serval Maps aware of the state of Serval Mesh
consolodiate the dialog code in the disclaimer activity
reduce the frequencey of location updates
Adding message for May 05th 2012 meeting.
Site updated at 2012-11-29 19:19:40 UTC
Final PreferencePane code changes.
added user for paper trail in controller
Updated Gemfile.lock, fixed risk matrix css
Merge branch 'master' of https://github.com/sherrywong/NERSC-Project
Added annotate_attribute_set DSL method
Library - Readme

Updated file to specify that it can be compiled using CMake
changes to module path
First pass at debian files
Create startup script /usr/bin/zotero
I always wondered how languages like Python and CoffeeScript check for meaningful whitespace, so I took a stab at it in JavaScript
Modify common_versions
Added presentation about the takahashi method
Merge branch 'master' into gh-pages
config
delete
delete
Prise en compte de la datasource
git ignore
recup distant
Fixed bad ConfigManager (I should really stop breaking it...). Now it
caches everything! :D
Site updated at 2012-12-11 09:40:17 UTC
More work on the grammar compiler. I need to find a way to deal with auxiliary (and anonymous, for all practical purposes) sub-instances of things. The single namespace into which they all get side-effectfully defined isn't the best strategy.
Migrated bootstrap logic into a waul object
Fortran calling cuda directly.
Making sure I know what ifelse does.
Pre-check fixes
DB doesnt work fine
Okay. Trying to reverse the order...
added a (cond ) statement with no :else clause
work on the readme.md
Objects are now immutable
beginning an iterable structure
Cleanup and additions to Readme.md
Now reading image files which are to be processed.
include setting for capacitive backlight timeout, and a small fix for notification panel flipped layout.
Fix for autocomplete form field ID
Fixed logs
Fixed *logos and updates riverWalk cards
Committing who knows what so I can pull Nick's app from Jeremy's repo
Fixes wrong G+ username
feed/index.html
add task subject validation.
Site updated at 2012-10-15 08:54:27 UTC
Dependency reduction
Octopress init
Site updated at 2012-07-02 00:54:39 UTC
Added ParsingContext as a parameter to VBAFunctions
Added coverage report for Debian GSoC report
use DisQus callback to track new comments in Google Analytics
rearrange layout of comment and related articles sections of a post
new blog post
fix url for last post and add a meta description
new blog post
remove old URL for blog post
added recursion to cp.
translate layouts
changed the hash function in vert_less to use longs instead of ints to support large meshes
โปรเจคตรวจข้อสอบ
Rework email sending framework to be clearer

More comments added.
Switch exceptions for when a product has no partner

This allows erroneous order creation to be handled gracefully rather
than bombing out.
Tweaked PIL import statement which doesn't work on travis
change code's background-color
ajout argument Client à bye()
- 既定のリージョン以外にもアップロードなどが出来るように変更
(https://forums.aws.amazon.com/thread.jspa?threadID=102634&tstart=25)
bootstrap 2.0.4
region model
new routes
deleted side nav bar site details
Fixed undefined length problem
Added instructions on how to run BDD Tests.
gitignore

Signed-off-by: tianjiaguo@gmail.com <jiaguotian@sohu-inc.com>
add AC,3D controler
Using python by path to reduce issues with aliases
typos
Added java properties and xml properties exports
Site updated at 2012-07-11 16:06:52 UTC
Merge pull request #3 from tiramizoo/master

added ability to have callback functions for attribute creation
Version bump to 0.5.0
Add Hungarian dictionary

This is the lates Hungarian dictionary used in LibreOffice and Mozilla
products.
Add Hungarian to the readme file
Hungarian dictionaries
Merge pull request #5 from kkemenczy/master

Add Hungarian dictionaries
Delete db_store
Hungarian in Magyar
Force SSL usage if FORCE_SSL environment variable is set
Update avoinministerio.fi and github links to use https
Merge pull request #94 from tmatilai/ssl

Force SSL usage if FORCE_SSL environment variable is set
Good Work Sneha
basic perl prefork code
Split out and rework pubsub system.

Needs a bit more testing.  Almost ready to merge.
Revert "See if this fixes lfranchi's assert"

This reverts commit e6af7b03d79abc75441f1e116ddad988907f3dc1.

Conflicts:

	src/libtomahawk/database/DatabaseImpl.cpp
Bump required Jreen version
* ContextMenu: don't offer an album link when there's no album set.
On Un/Love, star in spotify
Made the Quit action shortcut work when the menu bar is hidden.
Support added to readme
Renamed theme to BIG-2012
Just swap out some images
Added some introduction text. Indenting needed
add a travis-ci's badge again...
Cadre contenant les JTable terminé.
Octopress init
Site updated at 2012-07-04 11:18:40 UTC
stagefright aacenc: Move system headers before local headers

This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
ApplicationThread: Check interface before invoking scheduleLowMemory

Change-Id: I51317386e1729366d19f7e3a1747b05170b9305a
SystemServer: Looper's getMainLooper to return ServerThread

Fix to ensure Context.getMainLooper and Looper.getMainLooper
returns ServerThread for system_server. Currently, Looper's
getMainLooper returns null.

Change-Id: I5324a1cc00e27a79ba97836a9377a584e6f76b15
Fix sluggish to launch an app

The new trace feature/code in 4.0.4, which will dump the app stack
trace every 500ms if an app can't be launched within 500ms, is
holding the global ActivityManagerService lock unnecessarily. It
slows down the app's startup.

Change-Id: Id3a87fc939d9a2b4ce23a14a24956c045f36cb7d
Solution: move the trace file write operations out of sync block.
GL: to remember to check

Change-Id: I34176d7c43a27a14ca1c707772b631a5f84c8138
uid stats error to check

Change-Id: I2f409afab4bedbb5f00a28be7c624347adc717f0
Blacklist => Whitelist
[HTML5Video:] Release MediaPlayer when WebView is paused.

When WebView is paused, Tablet could go suspend mode, but
MediaPlayer and all resources set isn't freed. To avoid
libstagefright crash and resume WebView correctly after
Tablet awaking and Ducati re-initialization, codecs buffers
should be reallocated and relinked. That could be done by
releasing of MediaPlayer and then AwesomePlayer and all
related resources thereby on WebView pausing. All related
context is restored on video restart.

Change-Id: Iaf0899c3460270e3743668d05feb997ee499f870
Signed-off-by: Sergii Iegorov <x0155539@ti.com>
Avoid adding FORWARD_LOCK flag to an updated system app

Consider the following case:
1. An app exists in /system/app or /vendor/app. (i.e, it's a system app)
2. If the app would be updated as a forward-lock app by downloading from
   market(google play), then it would be installed in /data/app-private.
3. Moreover, if it would be updated by the whole system image (i.e, FOTA
   or something like that), then the app would be applied a FORWARD_LOCK
   flag.

The app SHOULD NOT have a FORWARD_LCOK flag. Because the resource path
of such app does not refer to the proper resources to access.

Change-Id: I0750f69a93a3115f4201029796b598507de3555f
jni: remove obsolete flag from makefile

Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Sensors could be disabled by any application

In the SensorManager API unregisterListener any application could
unregister any sensor. This lets any application disable a sensor
which another application is using.
This fix restricts the applications to only be able to unregister
a sensor it has previously registered to.

Change-Id: Ief926dd29f480dd97626160810dff87a8d3ac8dc
Send2cgeo download start from cache list
update of api routes for pulp completion
update of routes for cp completion
update of routes for candlepin completion
allow oauth communication with cp api
Default font size in xterm
X selection copies to both primary and clipboard
New Image: mistrel
Added initial code + some tests.
added mosueMoved and Dragged functions
removed scrollpane for the video section
changed legend text
adjusted model to reflect returned json structure
changed key names to match response from the backend
Merge branch 'master' into json_download
pointed downloads to temporary urls in taxon_concepts_controller while working on queued downloads
Merge branch 'master' of github.com:unepwcmc/cites-checklist

Conflicts:
	app/javascripts/views/download_view.js
Updating PAT recipe
Allow Typography fields to be filtered out of the UI
added 'question' view
Update scratchpad
added end emit
Change the version #
Merge branch 'release/r'
Merge branch 'release/deploy'
Update README file
Merge branch 'release/deploy-0.2'

Conflicts:
	README.md
Merge branch 'release/deploy-0.4'

Conflicts:
	README.md
Merge branch 'release/deploy-0.5'
Merge branch 'release/deploy-0.6'
Merge branch 'release/deploy-0.7'
Merge branch 'release/deploy-0.7.1'
Merge branch 'release/deploy-0.7.2'
Merge branch 'release/deploy-0.7.3'
Merge branch 'release/deploy-0.7.3.1'
Merge branch 'release/deploy-0.7.3.2'
Fix composer.json
Merge pull request #1 from Seldaek/patch-1

Fix composer.json
Merge branch 'hotfix/Seldaek/patch-1' into develop
updated scopyleft ref
working on dokumentation
start working at "projektplanung"
Lazy File System for huge virtual files.
Update summory info
Fixed val mapping with mappedPoly, finished.
Latest hg pull: 08 Aug 12
set the main h1 to important
float the header all the way across the page
Reorganized projects into folders 'libraries' and 'ardunio programs.'
Fix incorrect path in bootstrap
Create form for adding todo items and validate for empty item
correzione in cost.xml
Merge branch 'COST'
images: Build 201211171157 of webos 1.0 for machine tuna on jama
packages: Build 201211171157 of webos 1.0 for machine tuna on jama
added web part to the report
fixed one minor compile time error in markov functions
Script done for specific example.
(bug 42202) Validate preference values in action=options

Previously, there was no validation whatsoever and the module would
happily write any preference you asked it to. This, combined with the
fact that the code using the 'editfont' preference didn't perform any
validation or escaping, led to a CSS injection vulnerability.

Using Preferences::getPreferences breaks some existing test cases
because a MockUser doesn't have groups for preferences.

Change-Id: I98df55f2b16ac1b6fce578798b6f58b5dad96775
[JobQueue] Do not count claimed jobs in isEmpty().

Change-Id: Ie5c14925c8d4797ada970de843091ead269e9ae5
Added license file
Changed insert json data
ignore paster eggs to prevent `mr.developer` reporting the checkout as dirty
Add missing inline validation option to belongs_to macro
Site updated at 2012-12-27 06:54:21 UTC
fix scan issue and add new feature for scan package configuration
nothing
fix Map.class type dao fetch bug
improve datasource ~~
add orm.ddl feature
add join/alias feature for orm module
add ModelHelper and fixed MVC http params bind bug
fix jar scan bug
fix orm bug
fix join bug
fix startup mvc.interceptor config bug
fix interceptor bug and add cascade fetch option api for DAO
nothing
add FTPUtil and ThumbUtil
fix thumbUtil multi thread bug, change it static to instance
fix ftp mkdir bug
fix dao order sql bug and fix mysql tityint(1) return boolean result bug
fix select class bug
add sleep arg to image_io get method
fix bug
Don't run CI for JRuby + AR2.
Site updated at 2012-11-25 19:29:57 UTC
Tests

- ensure they pass
Links

- make it easier to know what link is hovered over
I just added the to do file.
Added Gerber files and updated files
Add post 2012-10-08
added tabview controller & user data model
missing changes for view controllers and data classes
Site updated at 2012-10-31 17:48:48 UTC
Site updated at 2012-09-15 14:55:32 UTC
adding python script for making contexts for testing in FC.scala
Site updated at 2012-09-14 12:27:48 UTC
bug fix with blockParameters
add block lifetime graph
complete getting info from server

but I have two more tasks yet.
- when it comes to no-internet-connected
- new xib for iphone 5
Site updated at 2012-07-23 13:44:26 UTC
Updating ignored files list.
Code coverage and Travis CI integration.
add architecture and workflow diagrams
LPS-26390 Fixes and small improvements
LPS-26390 SocialActivityCounterLocalService Test
LPS-26390 SocialActivitySettingLocalService test
LPS-26390 Generated
Fix doccomments for consistency
Add Interface type tests
Fix typo
Improve check for abstract modifier with interfaces
Fix doccomments for consistency
Don't replace boolean with bool
Track interface and constant inheritance

The handling of interfaces with multiple inheritance should be much more reliable after this change.
Add support for cloning interfaces

This involves quite a few changes tied up with the last set of commits.
Add --clone option for generate:interface
Set version to 0.5
fixed README to reflect new command-line args
Added the graph needed for hw1-linear algebra
get and put now implement tree iteration themselves

VBox unstably treats directory puts and gets,
so lets put and get files only, creating intermediate directories
and performing recursive iteration ourselves
Working on the structure of the readme for master
added disqus for jknav blog post
go to organization w3schools ;)
Merge remote-tracking branch 'origin/master'
solveing  the bug in zooming
Updated version info to 3.0.1

Signed-off-by: Michel <info@1st-setup.nl>
Added first steps document
Made several good changes to the Board class. Almost done
Added support for derefence expressions like `[somelabel+1]`,
`[somelabel+B+1]`, etc. Still need to add support for literal
expressions like `somelabel+1`.
Misc
mode details in error
updated Nuget References
updated version number
Twitter added to repo
Find where in implemented
Readme file added
Store downloaded file on the disk instead of memory
remove frist and last classes / add first-child and last-child instead
removed webmap from manifest
set theme directly to Holo.Light instead of using AppTheme; set actionbar color to gold; set the popup in map to gold also without outline
PlaceDetailActivity: removed the navigation buttons, use actionbar instead; added padding to the content to give more space
MapActivity: removed tabs in action bar; use home button to navigate to GuideMain instead
GuideMain: removed Map tab. use the actionbar button instead; added a Stats tab for histories and most frequent visited and some other stuff
GuideMain: fixed the actionbar button, now has refresh button to update current location (not yet implemented)
Merge branch 'build-problem'

Conflicts:
	GuideAndroid/res/layout/activity_place_detail.xml
	GuideAndroid/res/menu/activity_guide_main.xml
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/GuideMain.java
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/PlaceDetailActivity.java
	GuideAndroid/src/edu/vanderbilt/vm/guide/ui/ViewMapActivity.java
Description: a daily report of 20121008
Solution: create a new daily report
Commit Reason: function implementation
Automated cleanup

Use final on private vars when possible.
Remove trailing whitespace.
Don't use 'this' unless necessary.
Use parentheses only where necessary.
Organize imports.
plugin updates: wordpress seo,jetpack
update @api (refs #2960°
delete parasite parameters (closes #3111)
reset cache param in DocFam (refs #3111)
correct test apiUsage empty arg (refs #3111)
Merge pull request #508 from Eric-Brison/3.2-I3111

3.2 i3111
added the 2-nd and the 3-rd hw's with tests
Removed maintainer cruft
Removed "DestroyedWallTile" leftovers ( Bitmaps , Bitmap Inits )
Konzeption (Datenbankmodell)
ChristiansController (Beispiel für Zugriff auf fremdes Model)
Enter reachable grade
apply and back button
Merge branch 'master' of github.com:Antimon2000/This-is-GRADE
ENH: Allow single mode or pd, fl data sets to be processed.
ENH: Make ANTS the new BTants namespace

The development tree of ants in BRAINSTools needs to
be kept separate from the main NIPYPE development
branch.  By putting it into it's own namespace
we can ensure that our versions are
explicitly used.
Hackfix xmobar breakage.

It's something to do with the way batteries are handled in wheezy versus
squeeze.  I don't really know what's going on with it, but hey.
Merge
Wheezy <-> Squeeze
Fixed a custom item's sprite.

Signed-off-by: Deus Dactyl <deusdactyl@yahoo.com>
Merge pull request #1637 from DeusDactyl/master

Custom item sprite fix
files for alpha version of rust fusion reactor.
rust integrated into antiqua, no breakroom.
lots of fusion bugs, missing features and imbas but it works.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
changed map back to tgstation208

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
Merge pull request #885 from caelaislinn/master

finished with antiqua, added rust fusion [alpha]
Made the rad event a bit more dangerous.
Automatic votes default to "none" now, but I added some extra info to the announcement.
Fixed: SFS Ban Admin Log entries were showing Unknown User for Guests.
Changed: Removed UNION from visitor log and added grouping of visitors.
Select list, slider, and checkboxes in predictor
Updated predictor styles
Added amount type options to student weights
Updated sample data to include assignment types.
Updated emails in seed data
Added new badgeset
Installed Airbrake
Graceful failing of stylesheets
installed sendgrid
Installed mysql2 gem for production
Installed carrierwave uploader, removed paperclip reference in user model
Added carrierwave upload to themes and badges
Updated multipart forms
Added postgres for Heroku staging environment
[LOGGING] Moving kernel log in the data partition
weightedGroupEngagementScore is added; it works great for filtering noise from groups; one third of boring items can be filtered without hurting interesting items;
Removed share
Fixes for Google+ and Facebook
Added function interestCompound();

also changed name of HEX2DEC to hexConvertdec();
Update README_auth.txt

make language clearer
Crude test for ID styling
fix settings templates dirs
fix settings templates dir
fixed another typo on ranking
若干修正（めんどくさいからバージョンそのままで）
Added Swamp and fixed Particle Manager tool again. I think that would be it to fix
Finished Environment particles
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Fixing all of my stuff
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault

Conflicts:
	armored assault/Source/TileManager.cpp
Merge branch 'master' into Dialog

Conflicts:
	armored assault/Source/MissionSelectMenu.cpp
Added Handler's Voice
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' into Dialog

Conflicts:
	armored assault/Source/Enemy.cpp
	armored assault/Source/Enemy.h
	armored assault/Source/GamePlayState.cpp
	armored assault/Source/MissionSelectMenu.cpp
	armored assault/Source/Projectile.h
Merge
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'Dialog'

Conflicts:
	armored assault/resources/Saves/0.xml
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
stuff
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
???
Merge branch 'rob_testing'

Conflicts:
	armored assault/Source/MissionSelectMenu.cpp
	armored assault/resources/Saves/0.xml
stuff
the user can now upload a file for their profile.
Fixed error in blog posts view

There is a problem with the table of the posts list.
There is an else but no if at the top to check if there are posts in the database.
This fix the problem.
switch to new shairport version
Don't die if the settings table already exists

settings was contained in the original database file we had in the repo, so it may already exist.
646 - set compile to true, because there is a bug in rails 3.1.0

http://stackoverflow.com/questions/7252872/upgrade-to-rails-3-1-0-from-rc6-asset-precompile-fails
607 - Action Dropdown Change to Buttons
creation du repertoire webContent
Added app frameset page.
Mapeando
Mapeando
1. Rename index.jsp to Mainpage.jsp
2. Rename MainPage.jsp to Mainpage2.jsp

Signed-off-by: Anne Mah <anne_mah@hotmail.com>
Merge Css coding into Css/style.css


Signed-off-by: Anne Mah <anne_mah@hotmail.com>
Merge branch 'master' of
ssh://git@github.com/DarylSky/SBNQuestionnaire.git

Conflicts:
	WebContent/View/index.jsp
Some tiny changes of slider
Updating 2.0pre
Moved encoder to an anon fn.
Fix build if Doxygen is missing
Fix the --without-docs switch to configure
главная страница
use unicorm
Merge pull request #7 from DmitryRomanov/words_mark

Words mark
результат анализа в виде облака
backupCount of log files set to 5
trying to exclude matching link to imagevenue pages that don't lead to images
using title tag for imgbox image's names
usb4bsd: Sort files a bit better in 'files' (from FreeBSD).
usb4bsd: Makefile cleanup.
usb4bsd: Add usb_quirk module.
usb4bsd: Sync usbdevs with FreeBSD.
usb4bsd: Regenerate usbdevs.h and usbdevs_data.h.
-Small edit to PlayerCharacter to clean up toString
updated Game.java to import Race.playable
adding buttons back, moving around stand detail elements
first stab at geosearch
Merge remote-tracking branch 'origin/prototype' into prototype
handling errors for geosearch
adding spinner
adding spinner and clearing markers between searchs
Merge branch 'prototype'
added order and sort and path is now sluggified
changed the tree structure and sort many now
Vorimplementaion für das Einfügen der Bilder
Merge branch 'master' of https://github.com/ErikWitt/CarAssist_iPhone
Finished URL Validation
URL to URI method implemented; added replaceString to StringUtils
Added url hint
meta tag test 3
missed action items
die and restart require passes with some IRCds' configurations
Added addTriangle method and unit tests for animation
replaced corrupted gifs
Modification of CSS for IE behavior
Update config.xml

Created Fork, and edited config.xml per PhoneGap instructions.
Authentication with passport. New Login page
second commit, adding project file, removed README.txt
Don't fix database name
autocomplete done in style, not logic, fixed edit button
fontconfig: keep cc_archoption empty on Solaris
- patch once again by icchan … thanks!
- Review here https://reviews.handbrake.fr/r/366/

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5065 b64f7644-9d1e-0410-96f1-a4d463321fa5
OGL Fullscreen support
Add default sort order to categories and contacts
Merge branch 'master' into update_active_admin
Fixed method parameters.
Adding monk CDs

Tracks the CDs when cast but still doesn't tell you how many are
available in raid.
Developed functional test page drivers
Commiting changes Tyler
make a translate request
[fixes #28937311] All for unsaved records to have no UUID

If a record does not have a UUID then one is created for it;
unfortunately this doesn't work when the record is unsaved, as the ID
information is nil and that violates a DB constraint.  This commit
adds the ability for the code to say "this record should not have a
UUID", and then that will not cause errors, except if they try to save
this marked record (which is an error in itself).  Hence the integrity
of UUIDs should be maintained and the ability to preview stuff (like
bait library assignment and transfers) is supported.
Merge pull request #486 from mattdenner/28937311_resource_id_can_t_be_null_errors_with_uuid_creation

[fixes #28937311] All for unsaved records to have no UUID
[fixes #28887299] Downcase and underscore roles.
Merge pull request #487 from mattdenner/28887299_data_access_contact_role_is_capitalised

28887299 data access contact role is capitalised
[fixes #28944943] Handle partial plate picks properly.

Do not push a partial plate as though it is full.  We need at least one
source plate to have been added to it.
Merge pull request #489 from mattdenner/28944943_cherrypick_to_partial_plate_leaves_partial_plate_alone

[fixes #28944943] Handle partial plate picks properly.
some more exercices...
Fixed the database relations so they work properly, also added in IP location lookup.
Update Documentation/Glossary/index.md added Hive
- additions to readme, settings, commands
track CM frameworks/av and native

Change-Id: I022c9956bdbdb17e727d0f57b11576728c2b3228
Added othr files
layout: Remove x11 from masters

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
不再嵌入外来插件
Fixing the synchronization issue in update & round timer.
made minor edits in format and spacing
Web Services :
- Orders : Add, Update, Delete, GET
- Orders -> check params
Replaced link to AHK_Wiki FAQ
Merge pull request #40 from hoppfrosch/7-Replace_Link_to_additional_FAQ

Replaced link to AHK_Wiki FAQ
Replace contracts with ensure clause
spec running for pay
Merge branch 'master' of github.com:dragonhoard/dragon-hoard
moving to OS X
use factories instead of the interface for setting up the next stage
Moved line item price validation to item and not variation
Added cart#add_item
Allows for items to be added as an id or object
Allows for options to be added to the line item when going through cart#add_item
Validates credit card number
I lost my way
fixed previous credit card tests
passing all tests
can delete an item from the cart in the cart view
Merge branch 'master' of github.com:dragonhoard/dragon-hoard
Checking for double email; !if refreshed doGet doesn't work
Changed a few things in the core file.
Bumped the version, final version for 1.4.2.
Added some basic roll-over sound
some fixes and build of part of utilities added
adding lib symlinks to installation
Created the SQALE Pyramid gadget as described in MARVSONARGADGETS-54
Fixed the gadget Ids of the SQALE gadget so that they are compatible with the Sonar panel
Corrected the i18n keys for the title and description of the SQALE Pyramid gadget
Added better documentation.  More coming soon.
MIT license added.
Readme updated.
Rework of loading TV recordings
In recordings view date order will now be total (sorting will no longer be folders then individual recordings)
When deleting the last recording in a folder user will now be taken up a level rather than left in empty folder
Fixes for several null reference exceptions when sorting by channel
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into EXP_TV_Recording_folders2
Reverted GetSpokenDate to previous logic
Updated date logic so it is now based on full days rather than hours.
Also introduced new value (and string) for last week
Created base class that both recorded radio and TV can inherit from.
Moved spoken date method to this base class
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into EXP_TV_Recording_folders2
Merge branch 'EXP_TV_Recording_folders2'
Add possibility to fetch movie info without saving to videodatabase
* Fixed fetching movie info without adding it into videodatabase
* Added possibility to use only internal nfo scraper
Fixed bug in SortTitle (always reset to false), optimizations for using nfo scraper only
Displaying changed caches in the Live Map. Improves #1184
refactoring: don't load caches in loops
Fixes #1211, Remove osmarender map layer
Changed format of JSON key. Fixes #1212
Fixes #1216, Live map: Grid JSON now containes real GC codes
- in a first step just removed the id translation
Update progress when removing from history and refresh list when done
Merge pull request #1213 from rsudev/issue1211

Fixes #1211, Remove osmarender map layer
Merge pull request #1217 from campbeb/fix1207

Fix #1207 - Update progress when removing from history and refresh list when done
Refresh waypoints on map after being edited
remove working comment
Merge pull request #1218 from campbeb/fix1156

Fix #1156 - Refresh waypoints on map after being edited
refactoring: never set listId of cache to TEMPORARY_ID

* TEMPORARY_LIST_ID is already set in constructor
* setting it again afterwards can be wrong due to merging with caches
from DB
* setting listId is not necessary during parsing at all, it is set when
storing, moving or importing.
Fix check for calendar add-on installed
refactoring: performance cleanups
Merge pull request #1220 from campbeb/fixcalendarcall

Fix check for calendar add-on installed
project: update readme to mention API 11
fix #1151: Clicking "Spotted in" on trackable screen can give Exception
fix #126: .trim() usage

* removed trim from UI
* if you find anything not trimmed now, it needs to be added in parsing
fix #281: Public consumer & secret key for Twitter / Terms of use
Refactoring to use common constant for ft per meter and usage of StringUtils
Change wiki_record into an ActiveRecord class.
Add User and PageView models.
Add user factory, Factory Girl, and test basic user functionality.
Create user, save in signed cookie, save color and page views in user
Add Requirements

Signed-off-by: Robert Xu <robxu9@gmail.com>
I realized how overcomplicated I've been making things. Time to KISS.

Signed-off-by: Robert Xu <robxu9@gmail.com>
Network reachability moved to backgorund thread
Removed an unused method to delete a warning from XCode
replacing shell with array in subprocess call.

some additional formatting
changing directory to GIT_PREFIX if available
replace '{0}' where it was not needed
deps should pipe yes w to the pip command
Merge branch 'feature/fix_cwd_and_shell_calls' of github.com:NarrativeScience/snakegit into feature/fix_cwd_and_shell_calls
Merge pull request #23 from NarrativeScience/feature/fix_cwd_and_shell_calls

Feature/fix cwd and shell calls
Addign folder with HDF5 examples along with README explaining where they come from
remove some unnecessary verbosity
Autodoc working (somewhat)
fixing up the lists and styling
updating index file - add more features to page
Update README, link to master user documentation
Save of lists in API fixed
Merge branch 'feature-save-multi'
added procfile for heroku
added mongodb parameter
Fixed URI for mongodb
Merge branch 'feature-db-uri'
Fixed index page styles
Changelog.
Remove egg-info
Remove ads for idnes.cz
WIP 18-3-2012

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Freedom hw config: wrap the overo configuration in #if define(PIOS_OVERO_SPI)
added comment file
Moved all info to wikipages.

Signed-off-by: Plaque FCC <reslayer@ya.ru>
Core/Spells: Fix vigilance taunt cooldown spell targeting.
thanks to: Kandera

Signed-off-by: Bootz <bootz@projectskyfire.org>
Core/Vehicles: Use DespawnOrUnsummon in Vehicle::Dismiss to call AI despawn hooks.
Thanks to: Shauren

Signed-off-by: Bootz <bootz@projectskyfire.org>
Scripts/Icecrown Citadel: Fixed crashes on despawning abominations during Professor Putricide's phase transition
thanks to: Shauren

Signed-off-by: Bootz <bootz@projectskyfire.org>
More Item_Template and loot_template corrections
changed event: in comments controller from #{event_path(comment.event)} to /events/#{comment.event_id}
render layout false for permalink
GM plugin: Serbian Translation
secondes sessions
Add preprocessor MOZ_B2G_FM_INTERNAL_ANTENNA

If  --enable-b2g-fm-internal-antenna is added in mozconfig, headphone
will not be used as antenna, the antenna is allways be available
Nuevos requisitos de busqueda por historial añadidos
1. add state_changes.site_id
2. remove inventory_unit while remove sample
3. remove zones and zone_members while remove sample
add dummy/db/schema.rb, log/development.log into gitignore
update readme
preview mail only Rails.env !~ /production/
1. support site.short_name
2. get site from params[:n]
1. add more locales.
Update lib/spree_multi_site/multi_site_system.rb

'short_name.dalianshops.com'=~/^([a-z0-9\-]{4,32})/
=> $1==short_name
fix short_name's validation
add Site.dubdomain_regexp
fix bug while get short_name from params[:n]
1. add gem daemons for delayed_job
2. delayed_job_config
1. fix load tax_property
2. load sample at realtime.
3. disable delayed_job
delete spec/dummy/log/deve*
1. add shop id as part of preferences.key
2. fix problem, load ruby_file in load_sample
3. asset.belongs_to site
4. add permalinks
5. add attribute_validator_cleaner
add site.subdomain
Revert "add site.subdomain"

This reverts commit 4f7bb7af310e96a554a0234ca0b13e07f108f17b.
fix bugs for default scope
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/dummy/db/schema.rb
	spec/dummy/tmp/cache/F35/B50/spree%2Fcalculator%2Fflat_rate%2Famount%2F1
	spec/dummy/tmp/cache/F36/B60/spree%2Fcalculator%2Fflat_rate%2Famount%2F2
	spec/dummy/tmp/cache/F37/B70/spree%2Fcalculator%2Fflat_rate%2Famount%2F3
FIX dump BUG
只支持标准浏览器的种子模块
fixed more saved search quirkyness
started ordering functionality
Improvement: use shared find_best_workgroup.
Fix: invalid use of __OPENCL_VERSION__.
Fix: remove commented code.
Merge pull request #52 from claudioandre/1.7.9-jumbo-6-fixes

Use shared find_best_workgroup.
Merge pull request #53 from Sayantan2048/magnum-jumbo

common-opencl.c:Added build from binary
Fix: proper usage of profilingEvent in host code.
Merge pull request #54 from claudioandre/1.7.9-jumbo-6-fixes

Fix: proper usage of profilingEvent in host code.
hccap2john fixes
Add --help option to john (prints usage summary)
hccap2john fixes
Add --help option to john (prints usage summary)
Improvement: use shared find_best_workgroup.
Fix: invalid use of __OPENCL_VERSION__.
Fix: remove commented code.
Fix: proper usage of profilingEvent in host code.
Merge branch '1.7.9-jumbo-6-fixes' into magnum-jumbo
RAdmin, SIP speedup
Integrate psk-crack (from ike-scan) into john.
RAdmin, SIP speedup
Fix sha1-per-key calculation
Optimized mscash2-opencl
JtR-bleed-align-macro-fix-1.diff
After testing on IOS/Adroid, audio tags don't seem to work yet. Ran speechgen and checked in wav files.

Signed-off-by: SchizoDuckie <schizoduckie@gmail.com>
* lib/myLawPlatform/Schema/Result/ArticleIdx.pm: remove a useless space
* lib/myLawPlatform/Schema/Result/ArticleIdx.pm: add a relationship with ArticleIdx.pm
* bin/test_match.pl: change LawDB::Schema to myLawPlatform::Schema
* lib/myLawPlatform/Schema/Result/ArticleIdx.pm: remove the belongs_to declaration
* lib/myLawPlatform/Schema/Result/LawVersion.pm: remove the has_many declaration
* lib/myLawPlatform/Schema/Result/ArticleIdx.pm: change the belongs_to declaration to reflect the current schema
* bin/test_match.pl: remove useless blank lines
Binding Link and Tag
Another Partial fix for #7
Remade getPrevBackups to be more efficient
Add system roles for Known and Implied Relationship group owners
Fix up Rock.Rest project name
fixed a bug where there were uses of methods from api level 12 when the same methods were available from api level 1
Add sources for PA1
add ignore of bin directory
Updated typography and home page. Fixes #22
Added note about making IPA from an existing App.
added corridor check
Remove unsupported LG devices, add the supported ones

Change-Id: I50f3342cb702227562bcff2ac5704a6191a58763
Add Apollo to list of built CM apps

Change-Id: I63249d277745720a14a43fe214cb04a4135def2b
Revert "Add Apollo to list of built CM apps"

This reverts commit 25eaed1829b1dd921f71964f39c4783e51a7822e

It only works in XHDPI phones, it's missing drawables for other resolutions and layouts for tablets.
disable compcache service

Change-Id: Ic2c698e072ef6bd1847317c6d026ca10d3255fc0
Our changes to cm repo... fix modversion (v4.0.4)
Merge remote-tracking branch 'cyanogendefy/ics' into ics

Conflicts:
	config/common.mk
クラスタ数kをグローバル変数に格上げ
Update webscraper.py
reconnect channels when the socket resets
Update jQuery to latest version (1.7.2)
Added the metaextractor backend
REmoving excess console logs.  Tested working in IE.
Updated metamodel by removing parameter relation from trigger 
Updated generated code after removing parameter relation from trigger in
model
Updated editor and descriptor file for change in meta-model
More stuff that I missed
fix the directory tree linker in TEMPLATE_DIR (we dont need the extra "registration"  bit at the end).
initial commit
adding name to actual module
Version 0.2 UPDATE! Added a fun math function.
Artifacts for the 1.1.0 version
Fix gitignore

Signed-off-by: Ollie <dzineit@live.co.uk>
Misc. additions
Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Refactor to com.volumetricpixels.wizardry

Signed-off-by: Ollie <dzineit@live.co.uk>
Fixed getDeviceIP in Communication
Merge branch 'master' of github.com:WSN-2012/WSN-Service-Base
Ditched the silly dependency on the version of node.
Renaming and cleaning things up. Adding an OpenID.bones server
Finished setting up framework.  Now the implementation is the next step.
make bit2txt output a bit more readable
convert raw pcm to wav file
test失敗
test成功
Merge commit 'ef0bb90685ad73f7ebfd731dac535447e49ed6c9' into HEAD
Textures now being applied in the shader. Still need to incorporate lighting. Can enable/disable textures and lights with 't' and 'l'. (Also fixed some issues with normals.)
AudioHub test - Streams audio between two computers
提交用于测试远程合并
Change example.rb to models.rb
profile style
merge
slit
added properties to be used in rules

updated some tourney logic to work with new rule
Merge remote-tracking branch 'upstream/master'
removing debug in hook_entity_property_info_load
fixed reversed single elimination slot paths
fixed the determinewinners method to pull the last winner of a published match
quick little fixes
removing important from css rule
Started package.
removed 'require(ejs)'
fixed admin undefined in template
changed procfile
update
good working stop
IDEA stockwatcher project.
Tweak Range annotation code block
Pass in page object to Save instead of body

Binds body and driver to same instance
Move driver screenshot calls to registered driver procs
Move RSpec type check to filter metadata hash

Remove extraneous local var
Use wget instead of curl
Add message at the end of install process
HTML5 mobile boilerplate

Simple display and selection of byvejr
wiki 编辑界面，输入框自适应
Initial tests for new authorization hooks.
Adds cached_obj_get to populate objects in put_detail and delete_detail methods
Authorization tests passing with patch.
Folder decorator for simple tree.
first running version based on hellophonegap of the book
"Beginning.PhoneGap.pdf"
show_item: 特定商取引タイトル +1
show_item: 特定商取引タイトル 0
show_item: 特定商取引タイトル 変更
show_order_item: 特定商取引タイトル 変更
暗証番号の入力: index,passcode_new,order
switch loading passcode
switch loading ordering addressee
fixed page blocks object
updated page tree object to work with new objects; added some new exceptions
added unit tests for new objects
Overhaul of github_locator, now asynchronous and redis based
Refactoring to simplify views and to reduce Redis memory comsumption
Refactored map loading and added repo charts
Assets refactoring
Adicionado categorias para os produtos
Adicionado Linhas para os produtos
localize %norm_of and &field_name_of
add EXAMPLES to POD
update POD
load HTTP::Headers::Util lazily
separate _new() from instance()
add Entity (again)
cut & paste some methods
do not use typeglobs
target() belongs to Header.pm
not so important commit
flatten() should belong to Entity.pm because dump() requires the method
date() belongs to Header.pm
new() become private
push_p3p_tags() is obsolete
can't assign to -expires parameter directly
update POD
add Adapter (again)
add adaptee()
set() croaks
rename adaptee() to header()
uploading paper pdfs and clips

probably will move the PNGs to /static/imgs/ eventually, after final
cropping
CnInterface 1.0.0.0
Show hidden files with ll command
Added completion for Python CLI
release notes in PEAR defaults.php fixed
Criação do Buscar Carona
Better timeouts, handle very long names better
Layout sample
Merge branch 'master' of github.com:arivazhagan/VisageHandson
Changed images to tile correctly
Search icon changed to + icon since the action is adding cities
menu order changed.
updated ie files
fixing class file name..
fixing class file name..
init commit
Merge branch 'master' of https://github.com/arudge/rochestermnhousing
update
Add precisions
Correct
Merge branch 'master' of
https://github.com/astone-solutions/testRepo.git

Conflicts:
	README.md
remove trace
move configurator out of scripts
formatting
remove the unix #! run
change the default_config_path of windows to \Program Files\Prey
comment out check delay until there's an impl for windows
allow debug to be logged directly to a file
untabify and lint
Update SF2 bundle link
Merge pull request #8 from FlorianLB/master

Update SF2 bundle link
pragmata pro as default font
load theme only in window-mode
flymake faces colors
2ª Tentativa
Merge branch 'master' of github.com:avelinoferreiragf/avelino
Rearumando
Rearumando
Rearumando
Após dicas da galera.
Fim
Enviado.
Remove $user param from printRecipientsAry()
debugged schroedinger equation