labofsahil/github-event-dataset-2012 huggingface dataset:
Add TODO note about #concern method. [admin]
ST: Added prettier inspections
add macos and linux help file
Call to_s on the values coming from the route arrays in the binder rake compile task
Fixed typo in generator and did some minor house keeping
brighter zombie images, updated map mechanics, removed random zombies in buildings
Merge branch 'master' of github.com:Lucky13xi/BounceAngle
survivor icon & high res death for daniel
committing.....but i don't know if anything is new
Merge pull request #55 from rxzr/master

ZOMBIES DYING
Merge pull request #56 from kkruusi/master

stuff
Merge branch 'master' of git://github.com/Lucky13xi/BounceAngle
WIP: Experimenting with ViewModel
readme added. FIFO/FILO route matching added
2806.htaccess_28162011
few tmux cleanup

add the rebase-new and edit-all git aliases
Fixed installer
insert mode cucumber alignment gist
Login

Fixed user login/logout and sessions
add tmux rename-window to irssi startup script
[Mansi/Akriti]#167 Dynamically added Add Event button on screen. Since we dont need it in MyMeetings view.
reverted back last change with SSL certificate check
TableModelBookDetail: Verfügbarkeit wird nun korrekt ausgegeben
BuchMaster: Inventar Statistiken werden dynamisch generiert
a -> ab
add Switch
Add rgrep alias
Adding emacs configs, so far for emacs24 and above
kill-whole-line is the savior of your brain
Adding emacs configs, so far for emacs24 and above
Intermediate changes.
Merging after rebase of emacs-dotfiles

Conflicts:
	emacs
dual issue branch test
Merge branch 'test_cases'
Regular users cannot run the supervisor tests.
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
Allow passing multiple test names(`-n`) to `runtests.py`.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
Added file.present state to allow check if pre-requisites laid down before deployment of services.  This is also standardized with hosts state, etc. with a present function.
Updated function name file.present to file.exists as requested
Change backups to be more accurate
Merge pull request #2099 from DarkSinclair/develop

Added file.present state ...
Fix #2057
Merge branch 'develop' of github.com:saltstack/salt into develop
file.managed functionality to enforce filesystem permissions when source is None and replace is False
Merge pull request #2101 from DarkSinclair/develop

file.managed functionality to enforce filesystem permissions when source...
Merge pull request #2102 from seanchannel/develop

missing line termination
A Loader is needed to handle Jinja includes (etc).

Fixes the ability to utilize {% include %} (and other similar jinja
specifics) in pillar data.  This is an issue since pillar is rendered
on the master but is outside the SaltCache loader's search path.

The simplest solution is to use the FileSystemLoader instead of directly
reading the files off disk.
Merge pull request #2103 from morganfainberg/develop

Fixes 2071
Merge pull request #2104 from seanchannel/develop

missing 4 params
Fix missing FileSystemLoader import
Merge pull request #2105 from FireHost/fix_missing_jinja_import

Fix missing FileSystemLoader import
Removed print statements that technically aren't part of the PBRAIN12 spec.
Moved the Line Coordinates into their own file to be imported by map.java. Did the same thing with the route Directions Map.
Changed some variable names for clarity
Changed LoadPackage.
Fix compatibility with Chrome/Safari.
Getting ready for production...
Console runner using NuGet Package
passing regex's through comment strip. updated comment.
modified:   js/sunflower.yamly.js
Setup project
Test change
Change shebangs to use /usr/bin/env to find the ruby.
Добавлен widget - отобрашение групп категорий
Fix unintelligent pets holding on to items they can't actually use.
Fix fix for drawbridge flipping so that doors on vertically-flipped levels display properly initially.
Diagrama de Atividades
MongoDB Windows
JMongoBrowser Windows
Merge remote-tracking branch 'origin/master'
determined adequate concentrations of proteins and how the relative abundance w.r.t. the reference chemostats, added [prot], %DW plots to send to protein analysis file
Adding the function ContainsRegex
v0.1.0.alpha6
Merge branch 'release/v0.1.0.alpha6' into develop
fix path to kanjidic2.xml file in populate.go
controller /vps/boot_tmp_cleanup/ is modify
root controller default action dispatch method is use "go"
validation for vps belong to project is add to controller /vps/, /vps/define/
gdev: added a patch for Linux v3.5 (by mharsch)
Merge remote-tracking branch 'origin/master'
fixed a bug in mrp registrar state machine
Continous scan timer
State machines in vehicle.c
Cleared all warnings in compiler
LED controlled from service
Report wise
Generic UI updates
renamed example config due to compile error
inform users when saving is done
added a smale guice sample
page_ element refactoring
Fixed openstack and openstack-keystone OSGi headers.
Improved discovery of api metadata inside OSGi.
Updated authors and added a small correction to the changes in ca84fcc279 for supporting beta versions in JcloudsVersion
Providers and APIs in OSGi can be discovered even if they are installed prior to the installation of jclouds-core.
added datacenter awareness to joyent-sdc
added joyentcloud provider=
added compute service adapter for joyent
Correct spelling errors
Correct spelled from delimeter to delimiter
createContainer, deleteContainer, updates to container to parse metadata and accompany testcases.

Added handling of null ObjectName.
version to joyent image
added iso data to joyent
EC2ImageParser checks platform==windows for OsFamily
joyent now w/keypair & metadata works in computeservice
Merge pull request #674 from aledsage/ec2-Windows-ImageOsParsing

EC2ImageParser checks platform==windows for OsFamily
cloudbridge compatibility glitch on AuthError
in CloudBridge terminatedInstances go away quickly unveiling the need to address instanceId not found
cloudbridge exposes a slightly different xml format for RunningInstances
changed test poms to use provider.template and provider.ec2-template accordingly
Issue 980:	timestamp on ec2 requests are in the future
new patch from @lightmare for protecting against expression.to_string misusage - closes #1232
Merge branch 'master' of github.com:mapnik/mapnik
fixup various plugin includes
clean up unused code and includes
ensure simple invalid inputs to wkb do not crash - closes #1333
add test for #997- closes #997
amend 516f7c7 to suport filtering on collections and rename line to linestring for consistency - refs #546
update changelog with geometry filter support as per #546
add test map for colorize-alpha comp-op
collect attribute descriptions in geojson plugin (TODO: sorting of attributes is returned in reverse order)
unmask failing test - refs #1345
add a geometry collection to csv wkt test
add render target
load_map: a stroke-width=0 is valid for markers now (for restyling svg)
no need anymore to have parse_stroke return a bool
make stock ellipse a true ellipse
+ turns off white space skipping
+ use std::auto_ptr
+ use pre-increment op
+ fix SEG_CLOSE value to be compatible with agg
Implemented ChangesetBuilder
update readme and add task assignment
axiom parameter
added info to filter files
account switch用マップを定義
displayIconを行うように設定（コメント化してある）
filetype設定用keymapingをcnoremapからvnoremapに変更
.
Merge branch 'master' of https://bitbucket.org/slimane/dotfiles

Conflicts:
	.gitconfig
	.vim/vimrcs/.vimrc.input
	.vim/vimrcs/.vimrc.vimSystem
	.vim/vimrcs/plugins/.vimrc.multipleSearch
	.vim/vimrcs/plugins/.vimrc.neoBundle
	.vim/vimrcs/plugins/.vimrc.tweetvim
windows対応
merge
変数名の修正
tweetvim_sayバッファーに変更があった場合でもバッファーをとじるように変更
UserInputCheck(message)のユーザー入力を表示する行を改行させない様に変更
.vimrc.localの読み込み先を変更
colorschemeの変更時にそのcolorschemeに対応した背景色を変更するコマンド、ファン
クションを定義
folding追加
Modified: Bahasa Indonesia translation. Change images.
Version Update v1.1

New version features:
- working New Episodes Feature
- tag watched episodes
getting the right bar and padding for center correct
Merge remote-tracking branch 'origin/master'
refactor to a milestone
viikko1 forkkaus
afegida la presentació de l'organització del cos humà
upgraded plexus-utils to 3.0.9 release
ajout vues (2)
p+: fixed string creation bug
autocomplete compatibility with wicket 6.
reloading database with an interval
Merge branch 'master' of github.com:spilgames/egeoip
Refactored some formmating expressions.
Update rules/game_modes/rules.markdown

A few minor corrections.

"Do not partake or create platform wars" now becomes "Do not partake in or create platform wars".

"Microsoft Terms of Use" now Becomes "Xbox Live Terms of Use" to be more specific and appropriate.
Modify views, add controllers
removed custom domain mapping for demos
(re?)added externs.js
- lophttpd: include unistd.h to get close() declaration
  (thx to Vitezslav Cizek)
Only use spaces for python at the moment
Remove unused settings
Prepare lazy 1.1.
modified admin only room set.
added '<?php', changed table name
Made changes to the way pages transition. Removed individual about page
more corrections to links
Initial commit of Purpl.
remove the mailer.php file that isnt as cool as the working one
split multiple attachments up properly
decide that the best way to handle deployment is to not handle it
backburner console history as well, since that isnt a huge deal
fixed the internal links and link all RFCs to ietf.org
install: add -S, -c flags
Chapter 1 - 3 beta
PRH - pulled all files from piktur server.  created upload.html  pushing all to github so we cen get the server re-synced with github
Ignore the swap files for VIM
jasmine first skeleton
more jasmine tests
update font settings so vim and gvim both play nicely.
prints to print string, not print
Maven installed and published to Nexus
NewClause and getComplementedSymbols added

Bugs fixed on ctr of Clause when a set of literals is passed
Add comment
diff --gitdiff --git a/init.d/00keybindings.el b/init.d/00keybindings.el
index 7c3a4a5..03f90b0 100644
--- a/init.d/00keybindings.el
+++ b/init.d/00keybindings.el
@@ -10,7 +10,9 @@
 (global-set-key (kbd "C-5") 'ctl-x-5-prefix)
 (global-set-key (kbd "C-0") 'delete-window)

-;; User keybindings (C-c letter)
+;; User keybindings (C-c letter and <F5> through <F-9>)
+;;
+;; http://www.gnu.org/software/emacs/manual/html_node/elisp/Key-Binding-Conventions.html
 ;;
 ;; Press "C-c C-h" to list all of these.

 a/init.d/00keybindings.el b/init.d/00keybindings.el
index 7c3a4a5..03f90b0 100644
--- a/init.d/00keybindings.el
+++ b/init.d/00keybindings.el
@@ -10,7 +10,9 @@
 (global-set-key (kbd "C-5") 'ctl-x-5-prefix)
 (global-set-key (kbd "C-0") 'delete-window)

-;; User keybindings (C-c letter)
+;; User keybindings (C-c letter and <F5> through <F-9>)
+;;
+;; http://www.gnu.org/software/emacs/manual/html_node/elisp/Key-Binding-Conventions.html
 ;;
 ;; Press "C-c C-h" to list all of these.
bold test scripts

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61579 e846bd91-c042-42a7-a218-4b65e2c1904d
logout function commented

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58629 e846bd91-c042-42a7-a218-4b65e2c1904d
logout function commented

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58630 e846bd91-c042-42a7-a218-4b65e2c1904d
added some type enforcing around WikiaSearchConfig::getNamespaces()

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61628 e846bd91-c042-42a7-a218-4b65e2c1904d
BugzID: 1302
Updated Latvian translation
DocumentView: deprecated modify_font() -> override_font()
Making the "you're not logged in" warning look nicer.
add example for TOWS_c

Change-Id: I9431d898d971b960dbdb2e65aab7e4766dfc793c
Improve the getenv documentation

Change-Id: I8c9d7bdf98207c6e6ed7ff33a9f6d95aa395f5e3
initialize some variables

Change-Id: I0de95b9a39f55c0dee54b5f94db1d844d652e325
fixing qtjambi version
cetrtek
Version send to the customer
Fixed Spacing and Unicode chars

Signed-off-by: Zane W Pickett <sirwolf@frostedwolf.com>
Bugfix when scripts has query string part in address
add profile resource
add profile resource
Rename YoutubeParserClass
add

add line
improve base handler and add a image list demo
Fixed #7 重启应用不会覆盖日志文件
Deleting a post. Deleting permission have also been done. Admin can
delete any post. User can only delete his own post
Merge branch 'master' of https://github.com/tapaderster/b561.git
Modify gettransform temporary
First version of adjust data ** will not compile **
added goose 2.1.19
add goose
Update Bootstrap to version 2.1.1.
Update jQuery to version 1.8.2.
Change location of the RPPA script.
Bump version to v0.15.1.
re-define dividend and divisor range. Now a range is a literal specifier
Fixed the path to the gem PERHAPS
Whoops, redirect was double-rendering
Added ajax preloader and fixed namespacing issue.
Forward trash_apply request to git-stash
change camera hal repo
listing.py: reverse sort order for listing jobs
adding a pre defined menus. adding a utils for basic php functions instead of classes
Add method to send a validating message to check the integrity of the system.
allowing "before:after" configs
Removed "/ch create/delete" commands due to no use

Replaced with foundations for "/ch apply" - Coming soon
add space bar
basic email configuration file
New flyer submission layout
The Table of project selection
Following Fixes to the table
Add some FAQ entry
Change to table
Implement import data
Implement upload
Added Word Frequency List
Documentation links
Dictionary APIs
removed top-level version constant
Use github for user guide
Adding default reverse chronological order for records.
Adding rspec config.
bugfix: Fixed varous bugs throughout system

Most bug fixes were either concurrency issues or memory management
problems, generally dealing with not completely cleaning up when
an error happened. Fixes were the result of a code review.
Predictive prior sampling looks like it's working!
Merge branch 'master' of github.com:tjhladish/AbcSmc
Update PS2
fileencodings$B$ND4@0Cf(B
Make it so that the hidden folders don't show unless explicit
incremental progress to executing cljs
merge
Merge branch 'master' of github.com:tmarble/nongrata
got cljs working--yay
merge
made for loop easier to read
Permit to toggle show of benchmarks and executables in comparison
Merge pull request #128 from aldebaran/toggle

Permit to toggle show of benchmarks and executables in comparison
RTMP Features now in main master branch of Jplayer project! Merged back into this fork - see details!

Also incorporated new security fix from 2.1.2 and fixed some missing
type declarations, so no more warnings when compiling from mxmlc,
better coding practice too. The best thing is though, that RTMP
features are now in the main project repository. :) Keeping this fork
open for additional work/customizations, etc.
Updated SWF - version 2.1.2 based on all recent changes
Syncing from main repo - no real differences - doing this for easier pull request completion….
chose different build types for the rater, added a little documentation
0.1 alpha2
Bug fix: TABLE_PIPE_CHECK ensure "|" not escaped
Update list.html

Add HTML5 DOCTYPE
add multi-target build rules and reformat skipped rules
add LINK_STYLE to new packages
ignore object files
makefile working with new layout again
fix a typo-like bug
add a test case
Fixed issue with loading of modules
fix no-stock buttons
Remove obsolete tool.
Remove unnecessary command definition.
Update metadata.
No XML files need to be included.
Ignore build stuff.
Use 'find_packages' from distribute/setuptools.
Removed obsolete files.
Parse installation requirements from pip requirements files.
Treat 'apps' as a package so that 'find_packages' finds its contents.
Move dir definitions to settings.py
Update included and excluded files.
Simplify option collecting.
Explicit is better than implicit.
Open file relative to its directory.
Minor reorganization.
Removed unnecessary main block.
Use a single directory.
Don't spread files in system's filesystem.
Be consistent with whitespace.
Cleanup.
o Different opacity for different priority
reparando error
Fixed issue 1021, Label text comparison incorrect.
Minor Tree improvements.
Fixed issue 1023, TexturePacker2 outputs images < min width/height.
Renamed MessageBox to Dialog, better describes the functionality.
TextField crash bug if text changes when dragging selection.
Changed TextField selection order so external code can select all on click.
Added selectAll.
Added scene2d.ui FocusEvent for keyboard and scroll focus.
Dialog, easily add key events.
Merge remote-tracking branch 'upstream/master'
added Bugzilla Assumptions
- Finished Implementing the Skill Tab
Fixed some Image Locations
Update classic-games/hello_class/README.md
Merge pull request #22 from alexkarpandrus/patch-5

Update classic-games/hello_class/README.md
status change improvements
CoffeScript vim support.
Añadida GPL
added js-libs for image-preview - added algorithm for POI-Icon aspect Ratio
added ligtview for picture presentation - solved fullscreen issues from within iframe - made wordpress implementation work
add monitor channel
Matlab (evtl. rückgängig machen)
Merge branch 'master' into Dirk

Conflicts:
	ENU PR 6/ENU_PR_6.pdf
tex
korrekturen, matlab
matlab
Merge branch 'master' of https://github.com/unizeug/ENU_PR_6.git

Conflicts:
	ENU PR 6/ENU_PR_6.pdf
Merge branch 'master' into Dirk

Conflicts:
	ENU PR 6/ENU_PR_6.pdf
	ENU PR 6/Matlab/ENue_SAF_Messumgebung.m
Four, not two
converted interfaces to Seq from Array
test1
Merge branch 'master' of https://github.com/vanipc/mysources
updated .png files
massive overhaul
DB-Initscript fix
removed more autotool stuff from the .gitignore for convenience
возился с вектором
Signed-off-by: versoul <mailto.versoul@gmail.com>
возился с вектором
Signed-off-by: versoul <mailto.versoul@gmail.com>
Added back elpa-dir

I needed the function, after all (emacs23 hack)
- Use 1.2.0.Alpha03 of gatein-parent and gatein-dep
- Use 2.1.0.Alpha02 of gatein-common
change version name to use dot instead of dash
[maven-release-plugin] prepare release 2.3.0.Alpha01
[maven-release-plugin] prepare for next development iteration
update to common Alpha04
significant build change. New attacking network code designed to be server-authoritative (except for movement).
streaming now working
timeout as time.Duration
added changes to master git
refactor countWords
added handler for numbers
Committing Haskell Examples
Agregado el hilo de ejecucion para las labores de coordinador
Solucion de conflictos
Merge branch 'master' of https://github.com/vsantacoloma/VCS
add comment.
fix assertion message.
fix typo.
Adding and refactoring validation tests
Adding tests, coverage is at 99%
Merge pull request #311 from wpreul/develop

Adding tests, coverage is at 99%
rubygems-1.8.18
Merge branch 'hotfix/rubygems-1.8.18' into stable
Add logging capability to xmlrpc_interface module.
Added pyo to gitignore list.
Removed debug statements from xmlrpcinterface. Fix some digital value reading
functionality, begin working on digital value parsing function that can be
optionally used to get just the hex representation of a value.
Fixed formatting but in the _set_digital function.
Wrap calls to adam_interface in try-except block.
Added "invert" option to reading GPIO values.
Move mask definition to prevent errors when there are no digital ins or digital
outs.
Rewrite get_digital function, add filter function to basically set "don't-cares"
before returning a value.
Whoops, remove git bundle...damn, need to start deleting those.
Added Digital In testing related functionality, refactored some of the
ADAMModuleDigitalOut code.
Disable ADAMDigitalInModule on ADAM4024
Improve debug output and add warning when "abort" method fails.
Updated production gem file
Field description added in JV and Payment Entry
Updated jQuery and minified versions
Let it compile under Linux and tweak Makefile a bit
removed custom user URL
add rails 2 devpay module by @nbibler
install devise
shamelessly steal specs from @RailsApps
Comment bovenin Valbewegingapp.
Merge pull request #1 from wesselstam/dennis_klooien

Comment bovenin Valbewegingapp.
Fixed typos in credits
Add minus float to the sample
Handle minus operators for floats
Add a test with the plus operator on float
Merge branch 'feature/minus_enhancements' into develop
New optimization : LEA x, [r + 0] = > MOV x, r
New optimization for PUSH/POP combinations
Optimize copy of registers
Fix the optimization by doing it in a second pass
Implement optimization for push to reduce copies
Integrate the test case
added vim-cucumber plugin
updated plugins
Added Rails setup instructions and helpful rake db commands.
Add nested navigation link interface.  Update jQuery and jQueryUI version.  Issue #301
added open command
add chinese support tests
add initial data model
Refresh after every resize.

This was slightly broken in firefox.
Merge branch 'develop' of git://github.com/wkmanire/refheap into develop

Conflicts:
	resources/public/js/create.js
Use functional stuff instead of for loops.
Update to new jquery practices and insert semicolons.
Lower max width significantly.
Factor code into smaller, cleaner functions.
Update noir.
Move middleware to a separate file and add middleware to strip trailing slashes.
Added various hot keys to paste and edit. Added jquery.hotkeys submodule for handling hotkeys outside of CodeMirror. Updated templates to include jquery.hotkeys script.
application generated with highgroove
add more items to gitignore
remove index.html
use sqlite3 instead of postgresql
better ignore for DS_Store
Merge pull request #7 from wmit/initial_app

Initial app
WIP 1 test failing
added physdesc to additional info template Issue #120
updated indexes
Restructure the file system
Rething thumb collector and route drawing a bit
The balls task with some additional options
Merge branch 'master' of https://github.com/xavortm/HomeWork
removed console.log; concat less and stylus output together
rm mythread
added error level option to filter logs
initial commit
basic calendar drag-to create
Merge branch 'master' of github.com:xmjw/DayCalendar
Actualizada font de los banners.
Added true-fasle logic and file opertions
v4toit
market renamed to FrenchTech
French tech update: fixed missing splashscreens and icons, simplified phonegap archive generation scripts
French tech update: big image resize and placed as local
French Tech update: resolved error occurring on android when using PhoneGap: "the connection to the server was unsuccessful", addition of splashscreen for all version, even html one
FrenchTech update: Android hardware back button handling
French Tech update: resolved bug where multiple feeds were loaded when reaching the bottom of the a list. Added debug class.
French tech js update
Merge pull request #34 from codam/develop

Develop
fixed body background bug
move hucli to git
remove neocomplcache, don't feel the need and it slows down vim
crap, maybe we don't need a CNAME fiel after all?
Update Admin/Templates/update_latest.tpl
Merge pull request #124 from akshay9/master

Latest ver
Uploading joomla25 files (plugin-files + language-files)
Merge branch 'master' of github.com:yireo/MagentoApi
update
resque
Merge branch 'yukatou'

Conflicts:
	app/controllers/slides_controller.rb
	app/views/slides/new.html.haml
rewrite yhroot.sty 2012-10-09
small fix to printing
post pull updates
Small site theme update
Shuffle text
修复关闭聊天对话框发生崩溃bug
nothing
Porting mojito doc over to the new yuidocjs

Ported mojito doc to use the new yuidocjs from https://github.com/yui/yuidoc. Replacing unnecessary shell calls with calls to JavaScript syscall wrappers. Utilizing wrench for recursive fs operations: https://github.com/ryanmcgrath/wrench-js. Deleting old python yuidoc from the repo.
Adding YUIDoc server support

Add --server option to mojito docs. This allows to run a server locally that serves the documentation instead of writing it out to disk. This works for apps, mojits as well as the mojito api doc itself.
cleaning up dependencies

wrench and yuidoc are only needed for development, but not to run the app in production. so moving them to devDependencies.
Merge branch 'master' of github.com:yahoo/mojito into yuidocjs
allow custom reasonPhrase in ac.error

Providing the ability to provide a reasonPhrase property when calling ac.error. Mentioning this in the API doc and also adding a UT. This addresses issue #273.
enhancing UTs for reasonPhrase

add a UT for the reasonPhrase in combination with ac.done and fixing some JSLint
fix typo in docs
merge release 0.3.30 (based on 0.3.29-81-g499d62a)
merge release 0.4.0 (based on 0.3.30-200-ga84bc31)
Merge branch 'develop' of git://github.com/yahoo/mojito into loader
when using the loader at the server side to generate combo urls we should pipe the yui config into the loader settings otherwise some settings will not be honored.
adding support for handlebars for the server runtime only for now.
cleaning up the handlebar wrapper for mojito as a view engine for the server side.
Added client side handlebars engine; Cleaned up jslint errors with server side engine
Issue #270: Added unit tests for client and server handlebars engines
Removed future jslint flag from hb client
Fixed PR comments
PR cleanup round 2
Made view engines asynchronous
Fixed client side HB renderer
some progress made using quantmod and doBy
figures..
Merge branch 'master' of github.com:zut/X-men-MaoPer
The interface is done for now, the basic features are there but still missing some, on to actual server side now
Initial project structure

Signed-off-by: Brian <bds6052@gmail.com>
these shouldn't have been here
update from ky
lots-o-refactoring.  fixed bugs

extra params can be passing in ctor
after-create only called on ctor
field set to nil in ctor will not be overidden
updates version to 3.6.0
Cowardly refuse to build deleted branches
Fix typo and lack of super
Update specs
Ajout de fonctions de formatage
ACT-1333 fixing upgrade script: adding missing constraint in upgrade
update gems
update bundle for fix
update gems
next update journalist
Create Config class
Object oriented!
Updating Gemfile deps

 * Removed some unnecessary whitespace
 * watchr => guard-rspec
 * jekyll - why do we have this?
 * removing some gem versions
completed migration to bundler-only gem management - suddenly it's much easier to manage this gem
moteur_test_puissance4 : 90%
Merge branch 'master' of github.com:Aluriak/Hubosans4

Conflicts:
	moteur/moteur.c
It did not work, and I do not know what was it
Inilialising in the right way
Organising the code
.
reportFail to clients report a service fail
Implemented reportFail in Controller
Method replicaAll created
replicaAll implemented
A new server receives a order to copy objects from other server
Removed unused imports
ser renamed to services
Conflicts solved
change default settings
MA: Events: Add 'chair' to the partiticpants. Close #343
AZ: skip vacant folks. Close #372
PA: Events: Fix participants, Close #345
KY: Committee: Scrape joint Close #378
gigya
NV: Pick up agendas as agendas, not minutes. Close #390
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:sunlightlabs/openstates
standardized action actors
attempt to scrub out more botched utf-8 chars
get rid of committee code stuff; moved it to bills.py
Merge branch 'master' of github.com:sunlightlabs/openstates
skip committees where all members are TBA; fixes #261
flake8 OCD
NM: Fix up regex for documents; close #389
switch form field placeholder text to ---
Merge branch 'master' of github.com:sunlightlabs/openstates
fix hosed sponsor scraping
fix image placeholder issue on state page
Добавлена форма регистрации и информация об очередной встрече.
copying over ssh keys to ~/.ssh to enable password-less login, fixing issue #158
increased logging for services that the AppController talks to via SOAP, to make debugging easier
Merge pull request #159 from shatterednirvana/copy-ssh-keys

SSH keys now copied to ~/.ssh
Removing Cakefile and using standard bin
fortran: fix two compiler warnings
Add column number in status bar
	modified:   .vimrc
Cava 140
Additional Optimizations
Moved some quests around.
Debugging abstract.class.datastore.paged.L5
Debugging abstract.class.datastore.paged.L5
Fixing dupe rows in unit test data array
Added game over animation
Rebuild Report 1 Done
Improved the potion test to detect missing PotionType values.
Merge commit '4a656a3f5c8a5f70580331f8baba9393c3b65b80'
Update dutch language for latest language template
Minor fix: Persistence provider was not set.
Fix: When BoneCP is not on the classpath, the undeployment fails.

https://github.com/BatooOrg/BatooJPA/issues/100
https://github.com/BatooOrg/BatooJPA/issues/100#issuecomment-10717646
Test case for https://github.com/BatooOrg/BatooJPA/issues/103
Fix: Flush failed java.sql.SQLException: An attempt was made to get a
data value of type 'CHAR' from a data value of type
'java.lang.Character'

https://github.com/BatooOrg/BatooJPA/issues/103
Minor fix: SetNull with not pmdBroken
Fix: CriteriaBuilderImpl#equal wrong behavior with Parameter

https://github.com/BatooOrg/BatooJPA/issues/58
Fix : In JTA environment, lazy initialization in external context fails
with "java.lang.IllegalStateException: EntityManager has been previously
closed"

https://github.com/BatooOrg/BatooJPA/issues/105
Test case for OneToMany collection returned as null

https://github.com/BatooOrg/BatooJPA/issues/106
Test case updated to better reflect the problem: Test case for OneToMany
collection returned as null

https://github.com/BatooOrg/BatooJPA/issues/106
Test case: weird behavior of persist in JTA mode

https://github.com/BatooOrg/BatooJPA/issues/108
Update Test case: weird behavior of persist in JTA mode

https://github.com/BatooOrg/BatooJPA/issues/108
Update Test case: weird behavior of persist in JTA mode

https://github.com/BatooOrg/BatooJPA/issues/108
Update Test case: weird behavior of persist in JTA mode

https://github.com/BatooOrg/BatooJPA/issues/108
Update Test case: weird behavior of persist in JTA mode

persistence.xml is not needed!

https://github.com/BatooOrg/BatooJPA/issues/108
Fix : weird behavior of persist in JTA mode

https://github.com/BatooOrg/BatooJPA/issues/108
Fix : weird behavior of persist in JTA mode

tests extended to test the extended persistence contexts.

https://github.com/BatooOrg/BatooJPA/issues/108
Test case: Several OrdersFacade dynamic SQL test results

Enhancement: Better error reporting.

https://github.com/BatooOrg/BatooJPA/issues/107
Cache has been ripped off
POM Versions updated.
Merge branch '2.0.2' of github.com:BatooOrg/BatooJPA into 2.0.2

Conflicts:
	batoo-jpa/src/main/java/org/batoo/jpa/core/impl/criteria/QueryImpl.java
	community/pom.xml
Disable QueryDSL Test
add Vimeo support
resize image if bigger than the view container
fix css for specific project
convert html to plain text
Update README
Merge branch 'master' of github.com:Blaisorblade/Bibs
Started adding scraper methods for price ranges. Modified runCallBack method to handle another format of call-back. Poor commit point
Renamed class from “Text” to “DocumentInfo”
Added xrandr execution and a primary command.
force deploy on heroku
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/layout/main.xml
Class sync 
Commit to try and merge to master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/layout/main.xml
Added the station detail popup dialogue 
Add gitignore stuff
Untracked binary files
Removed some class files and added more to gitignore
Merged dan's fork to DanFork branch
Added gitignore for bin/classes/ncsu/carjuice/main/
Merged DanFork branch which in turn was a merge of Dan's forked repo
enabled map cleaning
Records endpoint now returns an empty string when the_geom is empty
Merge branch 'develop'
fixed layer sync
modified:   app/controllers/Posts.java
	modified:   app/views/main.scala.html
	modified:   public/javascripts/views/post.js
Create slick.cellexternalcopymanager.js

fixed a bug from Celebio/Slickgrid where view would scroll to top on copy/paste.
Merge branch 'master' of https://github.com/red-L/SlickGrid

Conflicts:
	plugins/slick.cellexternalcopymanager.js
Extreme restructural commit
Name change from watcher to observer
Added basic Behavior Tree classes.
fix popup so that tip shadow is not cut off
Writing spec for todo example
Merge remote-tracking branch 'origin/master'
Continuing to write the spec for the todo example.
human name, not real name.
Just have to write the doc and tests now then the

firmware's code
[feature] made font size for statusbar items smaller, started splitting out menu html
[feature] split out menu.html to circumvent blackscreen bug
[feature] start adding hiring info
FIXED? - Copied and pasted note_view and SoloActivity from Colin's
previous "Blah" commit
change reference to existing dir
Merge pull request #2 from jlowin/ucr-directory

change reference to ucr dir in setup.py
add size kwarg to fetch_file
#9 implementation TrueFalseQuestion
Import: add check
Toolchain selection is now stored with post data.

Fixing naming on dropdown as well.
Escape key now is default shortcut to exit (issue #7)
Fix non-minimize main window on @Exit@ shortcut, when use "Minimize to tray" option
Some small code formating changes and remove unused code
v0.9.94
Working stubbed out UI.
I have absolutely no idea how this change got here in this branch
Begin refactoring matching code
Quite a lot of rules are compiling now.  Non-sequential matching needs to be made to operate.  Also, definitely supplementary data.  And there are problems with infinite rewrites.
Info views and files mode added to library
Add resume button to list and info for movies/episodes
Made the SB images use the API
Merge pull request #96 from midgetspy/sb_api_images

Made the SB images use the API
Merge branch 'library_info_files' of https://github.com/N3MIS15/maraschino
tidied up media info
disabled artist info
check if artist has information
Proxy XBMC images behind maraschino so they work outside of LAN
Made movie posters not get cut off.
Use proper units and formatting for speeds and sizes (TB, MB, etc)
updated AUTHORS
Merge branch 'format_bytes' of https://github.com/midgetspy/maraschino
Merge branch 'movie_posters' of https://github.com/midgetspy/maraschino
don't display movie thumbnails in compact view
Merge branch 'proxy_xbmc_images' of https://github.com/midgetspy/maraschino into proxy_xbmc_images

Conflicts:
	templates/recently_added_movies.html
use path converter in vfs_proxy URL
use server_address, as we need auth
Support python 2.5 by allowing simplejson if json doesn't exist and not using unsupported except syntax.
cache images for library info and currently playing
fixed cell hierarchy and changed some colors
Merge remote-tracking branch 'origin/master'
highlighting is fixed
admin nd adminless no longer visible in existing users
Implementation of Delete functionality

Documents can now be deleted from MyDocuments and Department Documents.
Fixed a bug in deleting a stale entry in DX_FILES when document upload
fails for some reason
Fix: GETPOST is already in method
Fix: sql injection
Fix: add special test
Added support for Catel IoC container.
Beginning branching project to v6.1 and v7.0
Adding changes for 7.0
All projects were duplicated and modified to refer to 7.0 assemblies
Removed unused resource.
Added more #ifs...
Merge branch 'features/7.0' into develop
Fixed a compilation issue of 7.0
Added installer for 7.0 assemblies - now installing into the root folder of a particular VS version
Changing version to v1.0.4.1
Fixed errors with 7.0

Temporary adding two DLLs required by v7.0. Hopefully this dependency is removed soon.
Adding the lib files to the installer.
Wow, combining delegates issue http://stackoverflow.com/a/491850/8205
Fixed an issue caused by an API change in ReSharper 7 build 80 (RSRP-321616)

Adding .DotSettings to the 7.0 solution
Updating version to v1.0.4.2
Merge branch 'release/v1.0.4.2'

Conflicts:
	src/AgentMulder.Containers.Unity/AgentMulder.Containers.Unity70.csproj
Merge branch 'release/v1.0.4.2' into develop
Fixing the startup path of devenv.exe for debugging the plugin
Merge branch 'hotfix/devenv_path'
Merge branch 'hotfix/devenv_path' into develop
Fixed VS Startup dir
Adding v7 project file for Unity (wasn't it here?)
Removed a call to an obsolete API call
Deleting trash

Deleting _notes folder
"32/64bit Libraries included"
64bit Libs
shared objects automatically selected according to system.
[*] Rootfs: Fix configuring network in testtool mode.
Better than Abhi's work
1.9.2-p180 does require gcc (seems to be an oversight, given p290 is marked)
Add an 'LLVM=enabled' hack to skip the LLVM filtering in verify_gcc for version which don't need it.

Def open to other approaches - there's plenty I don't know about bash.
Use a boolean variable to track LLVM compatibility
PartRepl
set status of task done
updated read me with project rename
-Initial import

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
able to query all dbb_or_d realvalue from plota_enum
now finishing the logic

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
able to query for province
Finish!
nextTrack sync
Added Message Generation & Reply
Merge
Add new test snakes textures for better understanding situation on the field
Obsolete code is removed
Added ability to draw others parts of the snakes body
Create IO panel with layout and no custom controls

The IO panel is laid out as a table, with rows for inputs (analogue and
digital) and outputs. Where "[ ]" is displayed currently, a switch icon
will be drawn indicating the state of the output, to emphasize that it
can be changed.

Both digital inputs and outputs will be highlighted when on. Analogue
inputs will have vertical bars behind the numbers, showing the current
value.

For testing, any panel created is now an IO panel.
deleting unrelated files and moving files
4/22/12 2333
allow for routes that can be processed with php, ex: $route['([^/]+)/([^/]+)(/:any)?'] = 'php:"$1" . "/do" . ucfirst("$2") . "$3"'; 
Added possibility of using callbacks.
revert changes to routing system - part 1
Moved callback routing feature to a sustom MY_Router.php class.
New optional routing system, v3
Fixed a bug when detecting if the user used a callback.
Corrected code style to be inline with project conventions.
Updated documentation
Changed spaces to tabs where necessary.
Corrected styling errors in documentation
Changed spaces to tabs where appropriate.
made some corrections to the code
corrected a few more style problems
users' default values are now respected in callback routes
updated changelog to reflect the changes in this commit
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop

Conflicts:
	user_guide_src/source/changelog.rst
fix a conflict, part 1
documented routing change
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Merge pull request #1945 from GDmac/develop

Fix #1938
template for individual product page
Merge pull request #1 from zackspear/master

Template for individual product page
Adding Receipt Model, adding methods to listing and transaction
Imported the java part of the BT zeppelin.
Added some arduino sketches
First complete set of changes. The crawl successfully goes through files in a given input directory and the script pulls down a given data set from the rotten tomatoes API using a query
Fixes to the production order form.
Merge pull request #111 from Gizra/25-4

Fixes to the production order form
#57: Fix URL redirection to item-variant on a new season.
new vim version
fix merge
Merge branch 'master' of github.com:Glabsounet/conf.d
Merge branch 'master' of github.com:Glabsounet/conf.d
modifie gwork function (create directory in  if the directory don't exist)
MOD: Pipe and camera rotation almost ok (still a bug in the pipe creation algorithm
removed all .suo and Logs files

Signed-off-by: Erio Maondial <linux.erio-maondial@live.fr>
Removed conf and logs

Signed-off-by: Erio Maondial <linux.erio-maondial@live.fr>
Merge branch 'develop' of github.com:Hayaweh/AudioPipe into develop

Conflicts:
	DÃ©veloppeur/Project/AudioPipe/AudioPipe.v11.suo
Test du parsing de query
Updated to salvage local bookmarks that are ready first
beginning framework for controller...
switch to daemon process
Tree generated in the right order.

The layers are stored inside the map
from bottom to top, so we should generate
the overlayers tree in the reverse
order.
vytvaranie defaultneho bloku pre pouzivatela
Merge branch 'master' of https://github.com/INKOGNITTO/NoteMe.git
rework pagination on my items page
Adding Worpress
Move function prototypes from JPEGfile_iostream.hh into JPEGfile.cc. Nothing else used them, so there wasn't much point to having the separate header file.
Adicionado o vídeo do Kretcheu e o form de cadastro.
Práctica 3 del 30/08/12
Database functions added, removed mongodb for mysql
Removed default Rails page
Removed default Rails page
Removed default Rails page
Errors removed
Removed default Rails page
Finished layout and routes
Level Editor Update
Merge branch 'master' of github.com:JacenLakiir/Vooga
Package Name Fix
Enable heartbeat montoring on default

With the change, the heartbeat monitor will kill the engine after
50 missed heartbeats (~150 secs under the default config).
solucionado background dinámico 2
Improvements for chat view.
Renaming blitwiz.physics to blitwiz.physics2d
resize a foto
Scenen geloescht
bf
uzgzu
Merge branch 'master' of https://github.com/JungleJinn/Energy
Fix issue #120 reported by @swilde
Check whether it is empty parameter before checking its value
Merge pull request #121 from kwangchin/insp12-issue-120

Fix issue #120 reported by @swilde
m_spanningtree Use iterators in loops instead of subscript operator
m_spanningtree Call ProtocolInterface::PushToClient when writing to remote client instead of sending PUSH commands manually
m_spanningtree Fix various bugs related to protocol interface and ENCAP handling
Most importantly:
- Match the server name not the SID for determining if an incoming ENCAP should be processed by us
- Handle the ? wildcard properly in the server name parameter of an ENCAP
- Send single target ENCAPs to the destination only instead of broadcasting it
- Make ProtocolInterface::SendMetaData accept TYPE_OTHER as target_type (on par with ProtoSendMetaData) instead of throwing an exception
m_spanningtree Fix potential crash in SVSPART handler, don't broadcast incoming SVSJOIN/SVSPART but send it to the destination only, and don't pass it anywhere if they were talking to us
m_spanningtree Remove no-op instructions and simplify code
m_spanningtree Fill a parameterlist in OnAddLine/OnDelLine instead of printf'ing parameters
m_spanningtree Remove low level stuff from SpanningTreeProtocolInterface::SendUserPrivmsg/Notice, use utility functions like the rest of the protocol interface
m_spanningtree Kill duplicated code in OnUserMessage/Notice, put code shared with the protocol interface into the utility class
Fix generating invalid UIDs after current_uid is 000Z99999 (next UID became 000[AAAAA)
Remove a no-op line
While at it, use a constant parameter for calling IncrementUID in GetUID
Get rid of curindex, use a bool to determine if we need to initialize (the initialization code in GetUID should be moved into the constructor or a new function btw)
Count the actual number of sent/received bytes in SocketEngine instead of the buffer size passed to the send/receive functions
Output "Commands(HASH_MAP)" in /stats z as it's a hash_map not a vector
Only return prefix modes from ModeParser::ModeString()
Previously it returned all mode chars regardless if they were actually prefix modes, e.g. +k, +g etc. if they were set on a user's nick. This bug has manifested itself in different places all resulting in extra MODE lines being sent to users on a channel, for example spanningtree sent an FJOIN #chan 111 +nt k,000AAAAAA if the key was 000AAAAAA's nick, which in addition to confusing services made remote servers send a MODE #chan +k <nick> to their clients on #chan. The same applied for all listmodes allowing an exact nick as a parameter, like +g
m_cban, m_svshold Only attach to hooks we have a handler for
m_callerid Fix module sending no metadata due to not being attached to appropiate hooks
m_alltime Use the dedicated function of the protocol interface to send notices to remote users
m_opermodes Get rid of the duplicated s2s message caused by SendGlobalMode
spanningtree sends all mode changes automatically if they're done by a real local user (i.e. not fakeuser), which is our case
Kirjaus tuntikirjanpitoon
some fixes to responsive layout, make bootstrap affix work
added header guards (finally!) and put in a nice build system created by queezythegreat
cons, car, and cdr working
Bug fix on minus and equal operators in JS version
Added license to JS version
Added license to python version
Changed recursion limit on Python version
Update composer.json

Correcting email
Condensing update to make it easier to apply. Fixed errors so I can move onto next step in the Update to Nagrand.

Signed-off-by: bryan <bryan.mayer26@yahoo.com>
Fixed some config var names. More stuff for users_acl.js.
Added new kWindow method: setBlocked(boolean).
Added language object.
-Still filling out the 'AI' portion.  Right now, 'Consideration' is being used to determine if the partner's values are factored or not.
v1.0.4: minor, useless update

Signed-off-by: Kwpolska <kwpolska@gmail.com>
fixing the pkgbuild
equipe customs
************************************************************************************************

	+ Neues Feature
	- Entferntes Feature
	# Einschränkungen

************************************************************************************************

+ Standardhintergrundsmelodie hinzugefügt
+ Musikplayer Steuerung angepasst
	: F9  - Wechsel zwischen Standard und der eigenen Musik
	: F10 - An/aus

+ Tastenbelegung geändert
	: F1 - Testeszene für SSAO an/aus
	: F2 - SSAO aktivieren/deaktivieren
	: F3 - SSAO Standard Qualität
	: F4 - SSAO Hohe Qualität

+ Spielkonfiguration eingeführt (File liegt GIT bei!)
[ViewController] Adding another example label to demonstrate character truncation limiting number of lines
[MSLabel] Manually merging in Alexefish's pull request. Made some modifications to keep consistent style. Copying his notes here:

The new line calculation was taking into account an extra space where it did not need to. Therefore a linebreak would be inserted too early with some strings

if ([[line stringByAppendingFormat:@"%@ ", word] sizeWithFont:self.font].width <= self.frame.size.width)

Was calculating the string width with an extra space, updated it to:

if ([[line stringByAppendingFormat:@"%@", word] sizeWithFont:self.font].width <= self.frame.size.width)

So that new line breaks are not inserted too early for the string, whole words are still maintained on a new line.
Add criteria of personal game
Create classes for each criteria (Buhgoltz & Berger)
form() E_NOTICE fix.
\Webshop\AdminUtils -> \Webshop\Orders
New attributes subsystem.
More updated to maec_bundle class: added ways of setting defined_subject and content_type attributes, along with subject_attributes element
Updated maec_analysis class to correspond with new bindings; added new method for constructing tools based on input dictionary
Updated maec_action class to correspond to MAEC v3.0; changed getter methods in maec_package, maec_subject, and maec_bundle to "get_object" for clarity
Added method for creating win_executable_file_object to maec_object class
Added ability to add Objects to top-level element in maec_bundle class
First GUI test classes / Fixed some bugs in FileChooser
Generated LoadTextFile & FrequencyAnalyzer
Last changes from 16.03 => drinking beer now
First GUI classes & functionality
Minor changes in functionality
First ActionListeners implemented
Minor changes in comments
ahora al eliminar un cliente elimina las mascotas asociadas
[MamutGame] Physic for player
Put translations in translate.js.
Fix issue with tbar items not properly looping causing buttons to break.
文字列の比較処理を修正
added postgis to gtfs and osm import
?
Close #417.
HW 6 - Form with buttons created baseline
Added the R4 document
added a fx dir and fx-file for the HUD
doT template engine applied to start page
settings.json added for configuring server settings
Merge branch 'master' of github.com:MetalRain/gameify
Added Jeija's 3D code, with a few edits from me
Move the imports locally, to avoid always importing all possible GC
transformers.
fix for mingw on windows (bookaa)
merge heads
changed execution permissions
Pagination on Bookmarks cpanel fixed
Fix pop-up and records selecting