labofsahil/github-event-dataset-2012 huggingface dataset:
bumped version to 2.2_tremmert_prod_patched, to indicate this is a non standard patched version of 2.2
- Fix autoloading
- Update to support CentOS 6 package changes
Add missing dependancies
Merge branch 'master' into master_treydock

Conflicts:
	manifests/dependencies/centos.pp
	manifests/init.pp
Add tempdir to allow passenger to work with SELinux
Add password_confirmation
Complete User model
Cleanup list of files used for fmk-online code generation
Add support for Mac clang compiler.
modified dummy textfile
fix stupid failing specs
flesh out the routing specs
ok, this actually was totally necessary
start building the controller, and defining some of the outer interfaces
use an object with methods instead of a hash
start capitalizing and such like rails expects
set the routes in rspec configuration
still trying to get routing specs to work
use simpler respond_with in controller
okcomputer#show to use value object
and use respond_with
fix stupid failing specs
flesh out the routing specs
Merge pull request #2 from tstmedia/base-controller

Start Defining OKComputer Controller
Fixed a bunch of bugs. goInDirection and goInWorldDirection seem to work. Not sure about circleAroundRadius.
Style changes, experimenting with fluid layout

- made header have a fixed height @ 180px
don't publish the latest jawn yet. bug fix update i think
Clear timeout on uninit, so that polls reset properly on rehash.
New module blacklist and more io.
don't re-clone repeated steps if they are visited twice

Fixes GH issue #181
Added edit region to config helper. Cannot do Add Region because of the Conversable API
hasn- fix bad return from doSFScopy

git-svn-id: https://xcat.svn.sourceforge.net/svnroot/xcat/xcat-core/trunk@12915 35838ccf-6b3d-0410-a007-ed7a3c9b06b9
Updated to latest django and added static storage
wsgi file
README
Another editing bug
Added global scope "Term"
Nice layout changes to the about menu

Also remembered to filter out the pronoun "I" and the article "a" from
tweets
my very first code commit
Normalize.
Should separate archive list by year.
Show 5 latest entries on index.
Fixed Installer Removing Wrong Files
Merge branch 'master' of github.com:uiuc-cs225/vm-tools
Лишняя строчка с rvm
Adding PyYAML as dependency

Adding PyYAML as dependency to fix issues with beanstalkc.
Added tools/clang/
Added projects/compiler-rt/
Update README
Fixing .gitignore that was included with the llvm svn code
added pass for acc
Updated readme

Updated the read me file with usage, requirements, and tool goals
brainstorming

started to brainstorm how the json configuration file will be formatted
first commit

The first commit. This is a working proxy between redis-cli and
redis-server. No configuration is required and the only two command
line options available specify the redis-server host and port
Update application/tests/setup_db.sh

Removed debug stuff
TINATAMAD AKO BAKIT GANON.TULOY KO BUKAS KASAMA YUNG AJAX
Removed 'AutoloaderProvider' reference.
Fix urls for submodules
test change
changes change
changes

AWESOME
Merge pull request #1 from Thenutcracker/master

JOHN PARK IS a WINNER
Add yasobjc.rb from https://github.com/roupam/yasobjc

Build snippets for Objective C programming.

*sigh*
Add objc-mode to modes where autocomplete is active
Add yasnippet to auto-complete in the autocomplete config itself

At the moment, this source is getting added in from my python config.
I should modify my drag and drop configs to add ac-sources only if they
are not already present in the ac-sources list.
On Mac, load objective c mode for .m files.
Check if a .h file is C mode of Obj C mode and load the correct mode
Add w3m el files as plugin folder.

w3m is required to read xcode documentation
Add anything.el to plugins.

required by xcode-document-viewer
Add anything-source function to read pragma marks in obj-c code.
Add xcode document viewer and related code to read xcode documentation inside w3m
Add objc-mode to programming-major-modes and ibuffer programming group
Add golden-ratio.el and autoload it

https://github.com/roman/golden-ratio.el
Update python-emacs from upstream
Don't turn on whitespace-mode in objc-mode
Change the hotkey for `copy-line`
Add code to switch between .h and .m files in obj-c mode

(hat-tip : @kirankulkarni)
cleaned with gitignore
sensor dla systemu linux
normal selct tab modification
Merge branch 'master' of ssh://github.com/venkatnr/vispertool
use config for system specific settings.
trying to optimize ReaderUtil
Update docs 12438d3dc671a6d59f472fcca9dffdb4bb003d74 (v0.2.0)
Improve shader slightly
refactored utils.accepts()
Added `req.accepts()` comma-delimited string support
converted model impl to xtend
1) 重命名项目triplelifestone
2）将简单认证和ext3scaffolding的功能合并

Signed-off-by: voechoid <voechoid@qq.com>
Added profiling functionality to MySQLi datasource.
Small cleanup.
Added profiling functionality to MySQL datasource.
Added a memcache wrapper.
git ignore updated
updated hubot
Updated TODO list, again.

Signed-off-by: Varun Ravishankar <vrdabomb@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO

Signed-off-by: Varun Ravishankar <vrdabomb@gmail.com>
Fix #19: outcircle not changed when scaling polygon.
updated printrec summary output
client work in progress
Review comments & lint errors.
增加浏览按钮响应。
add Expr.getTermToken test, set default function when addSugarFunc
Merge branch 'fix_sugartest' of https://github.com/wakamori/minikonoha
Merge branch 'sugartest' of https://github.com/wakamori/minikonoha
Merge branch 'master' of https://github.com/shinpei/minikonoha
Merge branch 'master' of github.com:konoha-project/minikonoha
adding $Float Pattern As Error
removing unncessary comment
bugs fixed in importing StmtPatternList
removing warning for multiline comment
fixed jansson
Merge branch 'master' of https://github.com/konoha-project/minikonoha
removing bugs..
bugs fixed at konoha.global
bugs fixed at kStmt_rightJoinExpr..
bugs fixed at KImportPackage()
adding konoha_common.h
renaming kFILE with kFileVar
fix build error when INFINITY is not defined
adding File_readLine .. (still underdevelopment)
merging conflicts..
basic ajax call
New profile tamzen for terminator
add the subhead & container
ruby on the box
stuff from GLI that I just do not want
test scripts hooked in through vagrant
cron job skeleton
wip
pulling down applications and updating them
adding rvm bundle dependencies
Added in openmoc main function and removed all cmfd references.

Also removed use of std::queue in the Solver and std::function in the
Parser since nvcc doesn't seem to like the C99 standard.
[lib-joomla] SQL92: Change invalid SQL form UPDATE ... JOIN
redo seeding
Youpla.
Just a markdown test
create admin circuits, create add class functionality
Not using ITIS directly
Merge branch 'master' of github.com:weecology/neonetods
Merge branch 'master' of github.com:weecology/neonetods
Merge branch 'master' of github.com:weecology/neonetods
Merge branch 'master' of github.com:weecology/neonetods
Merge branch 'master' of github.com:weecology/neonetods
Adding draft of restructured status table, associate code, and log of lines not included
Fixing minor bug in fuzzy text match.
minify css
minify css
Created orphaned branch patches/release/roslib
Updated patches.conf
Updated patches.conf
creating shap functions in draw so I can just pass method name to define what shape i want
Checkin release notes.
Don’t write to /tmp in configure

If another user (on the same system) builds TextMate then he blocks everyone else, as other users would be unable to overwrite /tmp/dummy.
Add instructions about how to change a xib
Keep window open after closing last tab. Fixes #24.

When the last tab is closed the window will be kept open if the
file browser is shown. It will close the existing document and
replace it with a scratch document.
Move oak::c_array to oak/datatypes.h

This simple wrapper is useful in a few places so we shouldn’t need to depend on the OakSystem framework in order to use it.
Move oak::basic_environment to the io framework

Previously this was under the OakSystem framework which depends on the io framework meaning that the io framework itself was unable to obtain a basic environment, which is necessary for next commit.
Turn private run_cmd (scm/utility.h) → io::exec
Prune GIT variables from the inherited environment

Incase we do a git commit that launches TextMate, it will inherit a bunch of variables from git, including GIT_DIR, which will cause issues for the Git bundle.
Keep version of mate (installed) in defaults

This is so that we know when to update the installed version.
Use user-specific temp directory for mate’s socket

We have TextMate create a named socket that ‘mate’ can use to contact the main application. Previously it was hardcoded to ‘/tmp/avian.sock’ which is bad on a multi-user system.

Placing it in the user’s temporary directory should ensure it doesn’t clash, yet still give us a predictable path (for mate to use).

Presently we maintain the old socket path as a link to the new location so that old versions of mate will still work.
Added fullscreen behavior to document window

In Interface Builder: Attributes Inspector -> Full Screen -> Primary
Window
"Enter/Exit Full Screen" menu item

"Full Screen Menu Item" template from Object Library in Interface
Builder, with key binding removed
Add example textmate image to README

It's a good looking editor, let's see a picture.
Implement ⌃Y for yanking last deletion
Fix clang searching to search Homebrew and MacPorts before defaulting to Xcode/Apple version.
Revert "Fix clang searching to search Homebrew and MacPorts before defaulting to Xcode/Apple version."

This reverts commit ca279b5cab59cd478dbe11f264f24176965ac5ff.
Fix clang searching to search Homebrew and MacPorts before defaulting to Xcode/Apple version.
Revert "Fix clang searching to search Homebrew and MacPorts before defaulting to Xcode/Apple version."

This reverts commit ca279b5cab59cd478dbe11f264f24176965ac5ff.
Merge branch 'master' of https://github.com/whitlockjc/textmate
Updates to make output cleaner, default workload automation
Update the ILinkDiscovery service method to include link and linkinfo to get the link type.
Merge pull request #267 from sriniram/master

Update the ILinkDiscovery service method to include link and linkinfo to get the link type.
Add port state as part of Link REST API.
Merge pull request #268 from sriniram/master

Add port state as part of Link REST API.
Show openflow clusters by default in REST API, but add a parameter to choose L2 or Openflow
Merge pull request #269 from readams/master

Show openflow clusters by default in REST API, but add a parameter to… 
enable/disable flowReconcile from property setting
Merge into master from pull request #270:
support property setting to enable/disable flowRecoconcile (https://github.com/floodlight/floodlight/pull/270)
error implementation
add bin
0.0.2
Fixed trigger for batch price update, document 13A add, fixed minor bugs
Dist build implemented for LINUX (DEB, RPM, TBZ2) and for WIN32 (ISS), bugfix #6
adding some better $.ajax defaults to fetchTemplate
* directory changed. from veritas pc
修正hhmm或hhMM时格式化错误的问题
Create wxPrintAbortDialog more sensibly.

Instead of having an empty constructor and filling the dialog with
controls from outside, do the work in the constructor.

This changes the meaning of ctor's 'title' argument, but this class'
terrible API made it unusable for direct use anyway, so it doesn't seem
to be harmful.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Return wxPrintAbortDialog from CreateAbortWindow().

Instead of returning a generic wxWindow*, return the type actually used.
It was part of the public header already, but not used in any publicly
visible way.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Fix crash when canceling printing in wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Show progress of printing in wxMSW.

Add the number of the page being printed as well as the total to the
wxMSW printing progress window. Improved the layout and fixed some i18n
issues in the process.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Restored the exact-fit-button horizontal margin calculation from 2.8 since it was too cramped.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
add popup adress
Removed unused files
Previous version on main css stylesheet was not used, therefore was deleted
fake window object has all the properties of the real window
Upgraded Scannit to 1.0.2
remove grep -v /dev
add hdd list
debug
debug
debug
debug
debug
grep -w /
debug
debug
debug
debug
debug
debug
add tips
debug
Add rtorrent module.
letを使ってspec中のインスタンス変数を排除
fix lab2/tableaux.c pour la portabilité

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
s/shakeAll/run/g
set sensible default for tracking origin/master
dfsdf
Trying to make it work on debian squeeze
Google の章 WAN 接続部の構成 コメントに従い修正
file パッケージに依存しなくなったので修正
Added Yigit
Merge branch 'master' of github.com:yigosan/Hello-World

Conflicts:
	Default.aspx
Use float not int to cast weight
Decode str in __unicode__
Add Nodebox work code

 * grid
 * iphone wallpaper
 * rasen
 * typo
08\08\2012
ichange : typo
fix package spelling mistake.
Added middleware and switched assets to run on middleware
Removed google tracking code. Reorganized header code to have projects page.  Included privacy policy.
CSharpFactExtractor can now deal with relative paths
index,too
[CacheFly] Add exclusion

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001291.html
[Disqus] Really fix.

embed.js comes from the subdomain for the third-party website.
Variable resolution record correction (in selected cases)
Successful parsing of test dataset, with minor quality issues
Incredibly temporary in-console test
Which files, again?
Better consoletest
A little help
Print it good
Making use of helping powers, and more printing
Record time-adjusting refactor
Low-cost parsing speedup
Console-test is still a mess, but a correct mess now.
Merge branch 'dev'
Configuration migration fixes, fixed model level coding standards
Copyright and coding standards
service api key
api key
Fix custom content types to support arbitrary types (fixes #5)
Cleanup the code a little
formated and added ....something
Fix formatting.
Make it possible to only sync new photos.
add ability to set custom lockscreen target images
Merge remote-tracking branch 'origin/4.0.3' into 4.0.3
refactored uploader, rpoccommand and gatherer
Merge branch 'master' of github.com:AdamSaleh/NitrateRPC

Conflicts:
	src/main/java/NitrateIntegration/TcmsGatherer.java
	work/plugins/NitrateIntegration.hpl
added datetime.nim and helper.nim
Added menubutton event listener
Renewed file structure for pages
Testing phone-alert method (test)
Minor changes
Added new level up sounds
Fixed hardcap.
Added more levels. Disabled broken upgrades.
Removed locks on thread_id generation .. Moving date/time stuf in time_provider.c
preparing dynamic directory listing , network.c is becoming rather cramped up ( spaghetti code :P ) I should split some of the functionality elsewhere
added one more post about interview
Added 3 post about webkit and retry
ticket:3 Settings fixing
Custom messages!
Update Rails. Move to HAML.
LPS-29378 Source formatting
LPS-29190
LPS-29190 Test Formatting
LPS-29190
LPS-29330 Properly hide image resize fields for Creole editor's Image Info dialog
LPS-29330 Removing static resizing
LPS-29330 Source formatting
LPS-29330 - Source formatting
Revert "LPS-29157 Fix incorrect logic? showPublicSite vs showPrivateSite"

This reverts commit e9497df298bc5abd7a00cbc7509954225177f616.
Revert "LPS-29157 fix in a better way. organizations with sites without pages should honor the properties"

This reverts commit 36076246fea9abec4d5bc60cfae1b91c2e262d9d.
Test Fixes - socialofficehome/microblogs
LPS-29349 Use default locale instead of hardcoding "en_US"
LPS-29349 Fix other case
Test Fixes - socialofficehome/privatemessaging
Test Fixes - socialofficehome/tasks
Test Fixes - socialoffice/setup
LPS-29433 Use null start dates for cron and interval triggers with no explicit start date
LPS-29434 set contextPath to StringPool.BLANK in order for the message to be Serializable
LPS-29435 Categories dont expand in Categories Navigation Porlet
LPS-29440 Add an attribute map to ProcessExecutor.ProcessContext
change pic
Merge remote-tracking branch 'origin/master'
fix menu-bar bottom
extend footer in product page
better design. removed background to pics. peer count.
adding all the static files from devlopers
Merge branch 'master' of github.com:BNOTIONS/SayWhatHACK
Remove unused
Add onset and beat tracking
Updated updateserver for Release
More changes for Joomla 3.0 layouts
first fix for issue #91
Some work on multitouch (still not complete)
refactor layout of layout link specs again
FIX A SERIOUS BUG IN IMAGE UPGRADE
Added PCI driver
homogenized comment style. simplified lifter method set.
Merge branch 'master' into gh-pages
Anims added
Meshes and Textures added
рефакторинг Action

События сами себя регистрируют при помощи IActionRegistrator
changed some code
Cleaned up code
fixed crouching/running bug
Merge pull request #38 from CGBDigital/27_falling_moving

27 falling moving
Merged Shooting Master
Announce repeat of last week.
Wrapped up common Confusion stuff in ConfusionProblem class.
Merge branch 'master' of github.com:CamelliaDPG/Camellia
Added some error handling for MUMPS solves.
Update last-edited date.
Merge branch 'master' of github.com:Crell/stflibrary
Update last updated date.
Merge branch 'master' of git://github.com/Crell/stflibrary
v0.1-alpha1-rev09
Adjusted re_HandInfo to handle new table format. Example regression included
Merge branch 'chazdazzle' into pokeit
A couple more edits which makes tour table names more concise
Merge branch 'chazdazzle' into pokeit
Track CM Qcom Display

This is due to CM cherry-picking CAF commits I had in local repo.
changed popup messages 2
Removed the Test project and moved the README to the top level.
Fix unintentional hierarchy flattening
Improve refid generation for protected namespaces
Update asasm.hrc
Improve handling of out-of-range signed integers
Handle empty contexts
Use UNC paths on Windows to avoid the MAX_PATH limitation
disassembler: Use more Windows-friendly filenames
disassembler: Use Windows filename logic on all platforms

This is to allow files disassembled on one platform to
work on other platforms.
Fix metadata handling (caused by error in ABC format specification)
Update Changelog
Signed-off-by: D3Development <operations@d3.indoubt.at>
content included

Signed-off-by: D3Development <operations@d3.indoubt.at>
add assets as example
-added scale double tap recognizer
Minor aanpassing GuiForm.java
TravisCI support
Move spec support into spec_helper
Remove stupid spec
Empty rack spec - implementation coming
Update readme with TravisCI status
Fixed an issue where OpenTK D0 would return Xna D1 & then mapped keys as a Dictionary as TODO stated.
Several Templateenhancements and -fixes
Several changes:
 * added RSS Support
 * small templatefixes
 * add JS for socialshareprivacy
 * changed font to googlewebfonts
Added some miscellaneous files/folders that need to exist for the app to run
Merge branch 'master' of github.com:Deconstrained/Gummii
Merge branch 'master' of github.com:Deconstrained/Gummii
Fix count_occurences method
rename dir and files;  release planning
merges conflicts with master
Updated master branch
Updated master branch
Got CTBSearch with a ton of output statements to help locate error.  I think I have three errors actually. 1) A mysterious adding of another 0 to the correct offset, making the answer supremely wrong. 2) Somehow a miscalculation of highByte in evaluate. 3) that improper sec value for what compartment the value is in.  Poop.
Update Resources/doc/configuration.md

Fixed few spelling errors 
- heigth = height
- bg_transparan = bg_transparant
Formatting fixes
Remove dump_dimensions function
small server changes
added monkeypatch to fix cherrypy
update klout location
Some clean-up and style changes
Remove a non-existent variable usage
checks that exists before matching on descritpion and url
Merge branch 'experimental' into stable
Merge branch 'stable' of github.com:Empowered/canvas-lms into stable
fixing refresh rate
added submission form
added submission form
Fixed hoes
Added missing ModLoader hook
Fixed mob labels
Some progress on fake server
Fake MP player for fake server
Finally fixed taiga
Released SSP 1.2a4 and OldDays 2.2a3
1.3: Trading
Fixed collision detection!
Fixed some problems caused by refactoring
Fixing Goomba
preprocess uses feed_id and user_id
removing lingering references to the record model
Quality Managment

Documentos Quality Managment
make bin executable
fix sql query, instance.name is web.1 and not the app_name
Demo
Merge branch 'master' of https://github.com/FranT/social_systems
Perfil: Eliminar; Usuario: Envio de correos y links
Perfil de Compañía, Perfil: Evitar que se eliminen si están asociados  a usuarios
Javier
Listo
Merge branch 'master' of https://github.com/FranT/social_systems
Merge branch 'master' of git://github.com/katelyt/social_systems
Menú: Agregar otra opción; Plantilla de correo para restablecer contraseña
Youtube: mostrar foto de avatar
Youtube: mostrar foto de avatar
Login: ¿Ha olvidado su contraseña?
Login: Cambios en resetear contraseña; attr_encrypted gem
m
asd
Youtube: mostrar thumbnail en home
Usuario: Guardar credenciales de Salesforce, modificar la confirmación
Usuario: Guardar credenciales, modificar confirmación y contraseña
Merge branch 'master' of github.com:katelyt/social_systems
:D
Fixed Spacing Issue

Fixed some spacing issues, can't find the other issue :/
Register permissions
Register permissions except the default true one
Location to Set from List
Portal checking method + API
Cleanup events
Save default config if no config
Maven party
Performance
Merge pull request #1 from mbax/mbax1

Mbax1
Site updated at 2012-07-04 20:24:20 UTC
Added countdown before game starts
Tweaked box delivery times
Glow effect on social icons

Only facebook, google+ and twitter
gain works although it's all still very crunchy
Changed outputs to use top.inc/bottom.inc style files.
Renamed _hero.gsp to _homeBody.gsp
[+] objc swizzle
Added Test for Characters and WowUtils
Getting hurt increases life?
gui zeug
Started game design

Implemented first classes
Added disableCache option & auto fill first window

I added a couple new features:

1. When the first page loads and it doesn't fill the screen the second page will be automatically appended.
2. Added new disableCache option to start from the first page with each page refresh.
Import the html template xSystem. The intervention's views serve as exemple. Read the wiki for more informations
updated the wiki
DB finished. Now we can start working with cakephp
Merge branch 'master' of github.com:Honix/codebarCakephp
fixed some stuuf
Edited Some Files and project properties
canonicalize path for vfs_volume_dir_avoid_changes
better handling of sshfs writes #107
added sort options #87 #37 #23
fix(forms): remove control.$form and use nullFormCtrl
IE+jquery fix
#28213267: Restored the delete button status to normal on clicking other item delete button in the list.
Some changes related to invite via gmail feature.
changed code signing for distribution
fixed recursion. see https://github.com/ivanchoo/TracWikiSync/issues/3
Updated logo to match inn-app logo
Sized image down a bit
Merge pull request #3 from lonix/master

Updated logo
Auto Installation V1.06
Changing date() to i18n_date() per Rarst
Add example listing
submissions container fix
Changed Client project properties to define CLIENT for all files.
Added tinyxml.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Added to the ignore list
Added loadanimation function body.
Added more code to loadanimation()
Added the code for the Tool Editor and the classes
Added stack-based state.
resolved.
added suo
Merge branch 'Stephen_Working'
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
modified .suo
Lots of fixes, additions, and cleanup.
Merged Linux stuff.
Added resource files.
Cleanup.
Fixed tab/spacing in a few files (more to come).
Fixed all tab/spacing (8/8).
Merge branch 'master' into Aaron_Working

Conflicts:
	Windows/Windows.suo
	src/client/animations/animation.cpp
	src/client/animations/animation.h
Fixed all of Stephen's broken code.
removed the unnecessary .user
Merge branch 'Stephen_Working'
new lookup_contacts works
reimplemented health and stamina bars, added HudControls to the GameLoop, and cleaned up the code some.
Added tagbar for ctags
Merge branch 'master' of github.com:Jesterman81/vimfiles
未完成任务

Signed-off-by: AB <www.wpj@163.com>
Added some pages. Added buttons for fb in git twitter.
change Acquisitor to populate block detector list from Analogue Input
Channels.
Another licenses mistake, I think this should be the right version
a couple of new EDM scripts added
Fix a bug whereby the serial DAQ was having difficulty parsing small
numbers.
a few minor changes to some loop files
Enable the LF2 channels to be demodulated non linearly from the top
detector.
SNLP dependency parsing version 1.0
make it possible to wrap an actor around a non-celluloid object
Trying to get the app on Heroku
im
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me.git into beta
username im profil
Merge pull request #3 from KhaosFury/master

Khaos Pull Req
Added Bidding.playerWinning message
Merge branch 'master' of git@github.com:B2OJustin/Salesmania.git
Merge branch 'master' of git://github.com/B2OJustin/Salesmania.git
Merge branch 'master' of https://github.com/KhaosFury/Salesmania
Merge branch 'master' of git://github.com/B2OJustin/Salesmania.git
Started to add message formatting.
Merge branch 'master' of git://github.com/B2OJustin/Salesmania.git
Core/DB: Quest 'Distortions in time'
Core/DB: Quest 'Distortions in time'
Core: Quest 'Distortion in time' - Codestyle

Replace enum name eCloseRift with CloseRift and add underscore to private
member counter.
Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script
Dungeon Finder: Fix teleport coords load
Merge pull request #8138 from durotar/master

Core/Script: Gnomeregan - Deleting duplicate texts and script adjusted
Core: Implement Gameobject::Use() for traps
Core/Conditions: Fixed a mistake in Conditions loading which didn't allow to use SAI conditions with negative source entry (guid)
Merge pull request #8146 from Gacko/usetraps

Core: Implement Gameobject::Use() for traps
Closes #8137
Closes #4811
Merge pull request #8088 from Gacko/q13038

Core/DB: Quest 'Distortions in time'
Closes #3011
Core/SQL: Renamed SQL from previous merge.
Core/Build: Build fix from previous merge
Merge remote-tracking branch 'TC/master'
Search form renders get params
fixed depart/return time filter, updated core
Imported xAce 0.4 which was downloaded from: http://hem.passagen.se/tiletech/ace.htm
Fixed fault that prevented xAce working on 32bpp displays.  Refactored the code displaying a character in refresh().  Reformatted refresh() because of inconsistent use of tabs and spaces.
Ensured that refresh() doesn't rely on the size of 'unsigned' being 4 bytes.
Added a changelog.
Get rid of unused variables.
Correct unbalanced comment.
Free memory that wasn't being freed.

ximage.data wasn't being freed and part of the problem was that it was being increased by linelen, so the offset would be wrong, corrected this.  Also in notify() apptext was being set to "xace" without any storage being allocated, corrected this.  Finally in notify() appname and iconname were not being freed.
Update CHANGELOG to mention memory being freed.
Correct assignment of strings to variables with no storage allocated.

Found two variables that had the following type of assignment without those variables first having any storage allocated for them:
	xch.res_name="xace";
Add more progress details to CHANGELOG.
Edited the README and added a version number to the makefile(s).
Also trying to make a first push to github in this fork (to see if I remember how to do it)
fixed a misspelling
Remove brackets from version definition.
Make use of version definition.

xAce now displays the version number defined in the makefiles.
Add email about Ace's Rom.
Change load/save file extensions to .tap

I Changed the load and save files extensions to .tap from .byt and .dic to be more in keeping with the other emulators and the vast majority of software archive formats.
Update changelog re: file extension change.
Update list of files included in package
Add reference to boldfield computing email under 'The ROM?' heading
Add mention of change to file extensions
translate 1st paragraph
translate 2nd paragraph
finish tranaslate of Introduction
add original link
Merge pull request #2 from Layzie/Introduction

Introductionの翻訳が完了しました
Fixed typo
Fixed worker call
Fixed websocket proxying
[whiteboard] build more tests
[whiteboard] finished api and tests
[whiteboard] resolved conflicts
[whiteboard] asynchronous api done
Added old symbol text to symbolChanged-Method from SymbolListener
Update to update functionality: don't repeat dark metadata elements with given set of keys (this way, previous dark metadata is not included).
Description: additional sampling rates to allow support for these with 3rd party usb kernels


git-svn-id: https://svn.slimdevices.com/repos/jive/7.7/trunk/squeezeplay@9679 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9
Description: revert 9679 it was intended for 7.8


git-svn-id: https://svn.slimdevices.com/repos/jive/7.7/trunk/squeezeplay@9680 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9
Update internet radio icons to use tunein icon

Added different size tunein icons and modified references in the respective skins

Change-Id: I95d88a8bee8eeeefe7f47bcfa633f858815ce0ed
Merge branch '7.7' into 7.8
Security fix: pupil can't chose curriculum ids of other classes now.
Added lua find module and travis hook
alter the index page
Not modyfied 7.x-2.6 version
Fixed tag
Removed commented-out code
The MADAI logo will now appear only once

You can connect to as many servers as you'd like or load as many state
files as you would like as many times as you like and yet
there will be only one logo.

It does this by removing any MADAI logo entry in the state file before
the XML is processed.
XML API base structure
Test if it will scrape when profile has newer data
Remove test ported to rspec
Remove unit test dir after rspec port
Fixed a bug about type hierarchy
Finished commenting the StarVizProps class.
Guess I need to remove the logging module file from here too.
Merge branch 'desk'
added fields translation
add input_device driver, do not need calibrate,can support much devices
add saga devices(HTC Desire S, G12), fix mount error on G11 and G12
add devices HUAWEI honor
remove unuse reouces for save size
fix bug that mkbootimg can also work when argument(MIUI_KERNEL_ARGS, MIUI_KERNEL_BASE,etc) not set
add devices shooteru(HTC EVDO 3D G17)
add devices lu6200, but the screen display wrong color
update miui of [jellybean]

Change-Id: I6d0b7c7e407ea42ec14493cfb2af74a36fbb7b3c
Ticket #2888: code cleanup before 4.8.7 release.

(editcmd_find): remove incorrect type cast.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(edit_find_word_start): type accuracy for word start.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(str_iscombiningmark): return gboolean instead of int

...and related changes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
lib/tty/color.c: use unsigned type for conversion between integer and pointer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(mcview_find): type accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(mcview_search_update_cmd_callback): add type cast for correct condition check.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
lib/vfs/vfs.h: indentation.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
lib/vfs/direntry.c: types accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
vfs_s_subclass::linear_read: return ssize_t instead of int.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
src/vfs/cpio/cpio.c: types accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
src/vfs/cpio/tar.c: types accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Don't create copy/move progress dialog for background operations.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
FileOpContext::dive_into_subdirs: make gboolean.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
FileOpContext::preserve: make gboolean.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Sync with gnulib 613bcb6205cf2b64d835c19074c5a7e7c6cb99eb

...and ab7a2b67b48deb4c253b3b6bd983690d71515265.

* src/filemanager/mountlist: do not classify a bind-mounted dir entry
as "dummy".

(ME_DUMMY_0): Rename from ME_DUMMY, but omit the "none"-testing clause.
(ME_DUMMY) [MOUNTED_GETMNTENT1]: New macro to encapsulate the exception
for bind-mounted directories.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
src/filemanager/mountlist.c: use GLib functions to allocate/free memory.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Parenthesis around some -1.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(add_widget_autopos): don't access to NULL widget.

(del_widget): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Disable the localized output of utilities such as - ls, git, etc..

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Ticket #2841: adjust i18n label sizes in learn key dialog.

Learn keys dialogue shows "smaller buttons" when localized key names
include special chars (as the "á" in "Avanzar página" for es_ES locale).
"%Ns" formats for g_snprintf are not reliable for multibyte encodings.
For larger buttons (> 16 characters), padding size must be zero.

Thanks David Martin for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Added first steps for supporting the geoNear command
Merge branch 'master' of https://github.com/Moligaloo/QSanguosha.git into test
update ai
Merge pull request #145 from clarkcyt/test

Test
fix a bug of zhiyu
Imagenes Perfil y Portada (Baja resolución)
fixed dot notation
updated sign in and sign up forms with new theme
mise en place du protocole d'échange (manque plus que le transfert + le fait d'ajouter le fichier dans sa propre bdd et dans la table)
changed version to 1.7.1
moved battle ticking to outside of the entity code
BIG CHANGE.  Major collections replaced with arrays.
Fixed bug where POST body was unicode
Add the licence file
uusi yritys, nappulat
Sync'd all branches with upstream @ Thu May 10 11:01:14 PDT 2012
standardised json return to { 'code', 'name', 'data')
Shadow function
Right for destroy document
Fix donations
Different forum background for modos/admin
Mesa: remove broken patch, this fixes #774, this fixes #857

Signed-off-by: Stephan Raue <stephan@openelec.tv>
add new conv to filetype cli-app,code cleanup
add new conf to filetype cli-app,code cleanup
Mere java doc
Merge branch 'master' of github.com:Pacmans/MapOfDenmark
remove old autosuggest hacks
chosen demo is missing
tests.py modified for test push
Anmerkung geändert
Getting ready for NVRAM->efi-boot-device-data reading
methods for tucker
Added new stuff, also a cat
found a bug i thought i had fixed already, a not used relict and a copy-paste error
Better fallback to admin bake templates
Removed /Send To

Signed-off-by: Fallensk8ur <fallensk8ur1234@aol.com>
Merge pull request #34 from fallensk8ur/master

Removed command
+ new player sprite
Add units to advanced graph axis labels
Add labor and utility graphs
Add tax rate and abatement as a % of output
Better visual cues on links
Changed a few messages

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
Added Coal Driven Generator
Added new tests for database

Signed-off-by: Alexander Book <redchrome@gmx.de>
Added sound and music!
Added sound and music!
Responsive flickering fix
проверка на отсуствие приложения и рабочих мест в форме процесса и выдача разного текста
Added main directive to package.json.
Merge pull request #5 from poulejapon/patch-1

Added main directive to package.json.
Adding some evening codings. Working on adding civilizations and that sort of stuff
Duh had the address wrong
Add some usage comments
rest skeleton modifed
Merge branch 'master' of github.com:alleveenstra/Mockoleth
Add oxm dependency
Now with speed control
[mate-extra/mate-dialogs] minor style fix
Updated index.html.

Fixed up the link to the download page.
Showing off nested references (%MIT% in a list and then %MIT% declared later).
[vim] Removed unused plugins
[bash] Minor cleanups
teste -5.1 eixo y all 2
Sqaushed a silly bug found by an awesome user from opendesktop.org
More snake logic and add train 48.
Normal error messages
filter basic weekend
Merge branch 'master' of https://github.com/Shonof/bredapp-merge
added salt for hashing
Update to 1.4.4. Remove Orientations-> use ForgeDirection instead
Made the quarry much more scalable
Power pipes now have a risk of exploding if they don't have anywhere to dump their power to
Power pipe needs some work to seize rather than exploding
Updated images and fixed links,final overlay fix
Fixed upcoming events, no distinguía entre los upcoming events del usuario que esta logged in a los del de un usuario que visite
Merge branch 'master' of https://github.com/Solthenor/eventurePR
Rework and optimize break override options
Fixed revision + .gitignore
Create project stas-cms
Clean up data types formatting in the readme
added sample map
Merge branch 'master' of github.com:TLane/QtOpenGLPacman
updated .gitignore
updated files with recent changes.  This should include all current files.  Development will continue on Development branch and next round of testing and production code will occur from Master branch.
remove build.xml
including additional changes and files
images/icons were missing because of a line in .gitignore removed line and added them back.
fixed formatting issues and added forms for selecting zoom and pvalue.
updated .gitignore
pvalue select now resubmits page to change Pvalue cutoff
changed to support an admin email list in web.xml and session var.  Although for some situations it will fall back on a hard coded default list.
Adding selection of tissue to "forward" circos.
Changing so we don't read from session variables after the top of the form is written
Making everything so it should work the same on compbio and kenny
Continued changes related to showing a subset of tissues
Changing to use tissue string
Going to correct version of this script
Corrected a bug with the location of a perl script for compbio
Added dependence on chromosome string and tissue string
Added Filter/Display controls to all gene.jsp region tabs.  Most work although still working on the controlled from tab(still needs column display controls and need to make filter controls work)
Added code to submit tissue and chromosome selections,
divided most column selection checkboxes into columns,
added column selections to the Controlled From tab,
added ability to open and close Filter/Display options
Fixed a bug with tissue and chromosome selection
added fixed colums,
added controls to hide/show circos
added control to minimize/maximize circos plot
fixed a bug with hiding/showing filter table
updated help to next version, but this is not final version for PhenoGen v2.8
Ajout assets pour boutton "Niveau suivant"
Merge branch 'master' of git@github.com:Tacoid-Team/puyopuyo.git
Correction des plank détourés
Ajout d'un boutton "Next level" en fin de partie si le joueur est
gagnant
bugfix: BitmapFonts dans le manager.
Fixed a character in Table sorter javascript.
Fixed french language file Not attending status.
add exception
add 3 exception
Fixed the big (small) bug, and fixed the git errors
Added update() getItem() methods
nochal
Added SD jplayer.blue.monday.png file
(PS3) Filebrowser - directories are colored green
Add L2/R2/L3/R3 keys.
(Xbox 1) Working controls - hardcoded binds - will be done
properly later
Garbage collector
Start work on location add command
block all direct access to "loc".
Update conf.yml for compliance with GiantShopLocation
Finish up onPlayerInteract
Add central point storage
More work for the add command!
Fix the worst fail in human history.
Fixed a bug with importing shops
Prepare GSL chat executor for add command.
Removed useless "String world" parameter from newShop()
Removed useless "String world" parameter from newShop()
cleanup
Fixed getStringList not returning a proper List<String>
Made GiantShop more compatible to GiantShopLocation...
Finish GSL add command
Early msgTemplate.yml update, version update will follow later.
Make GSL acutally work!
Update to GSL PlainJane
Add list command to GSL
Added integration samples for optimization
Testing scanner with combinators
Adding support for selectors with combinators
error :D
Last adventure Branch!
Update test_resources/test_user_agent_parser.yaml
Update regexes.yaml

For webkit nightly
fixed typo.
Added D port
fix README
fix README
parseInt instead of explicit cast
Merge pull request #52 from shripadk/master

D Port + Fixes
adding support for patch, family, and osPatch attributes to sort of match the other libraries
making the PHP section match the other language sections
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.markdown
	php/CHANGELOG
	php/README.md
	php/UAParser.php
Implementing getRow() and getRowId()
Merge branch 'master' of github.com:Tirasa/OpenJPA-Azure
Added the ability to specify what option to vote for by ID.
Getting poll info returns option IDs.
Different data storing methods.
Allow for poll creators to see who has voted for what option.
(Some different compile options for NetBeans.)
Bump version number.
update the bundled node-glob to v3.1.12
update the bundled graceful-fs to v1.1.10
update the bundled node-mkdirp to v0.3.4
update the bundled fstream
update the bundled minimatch to v0.2.6
update the bundled tar
Fixed Dependency

* Fixed Dependency
+ added Bukkit Dep.
Edit Item Name

Item Name editable
A reminder to set PATH properly in the crontab.
Changed channels to event emitters, reflected in chrome
Changed channels to event emitters, reflected in chrome + Documentation
Added import in DB to make it compile and fixed the package path for the activities in the android manifest
文档标题显示
firstCommit
New commit
Merge branch 'master' of github.com:WladRSP/WorkshopRepo
Communication interface uploaded.
Merge branch 'master' of https://github.com/WooDyDooKs/VS_Sudoku
legacy(stable) version 2.02
testing nearly complete for cartitem reservations
moved reservations _flash_alerts partial into layouts
made destroy_set RESTful #180 #192
Merge commit '13045b' into development
Merge pull request #1 from jschr/master

update
Merge pull request #2 from jschr/master

update
update to bootstrap 2.1.1

had to revert back to use bootstrap 2.1.1 js for demos to work
Merge pull request #4 from Yohn/master

update to bootstrap 2.1.1
First commit standard folders and files
update ss12
Issue a compile error if if not on MSVC/GCC
Fix inconsistent line breaks
Revert "Revert "Make RETN one instruction shorter""

This reverts commit 7a2ee441248925c0f2e17c7268d0fafc390dfe93.

Conflicts:

	jit/jit.cpp
Get rid of CallContext
fixed history issues
add javelin submodule
omap3-sgx-modules: using own recipe for omap3-sgx-modules now, overlay not needed anymore
new sample MVC site to get things moving
Added partially complete GravitySim lab, renamed other folders
setting new version number
Merge commit 'e22da3456942a1963cbc6dda7e284dde5a68acb2'
reading categories from presets
Now reading presets from xml files.
Merge presets into master.
merge
randomize fraglen
Minor tweak to EIT period/interval.
Add support for genre mapping in opentv. Fixes #14.
Fix problem with not storing owner module in epggrab_channel entries which results in things going horrible wrong.
Added missing free() call to DVR code.
Merge branch 'master' into epg-rewrite
Added cacheMode property, some code cleanup
Updated Readme
added total sums to facets
restyling of the front page.
New footer from designer
Show recently viewed list by default
Include presenters helper from engine config
Merge helper files into one
Selecting focus loads searchbar section via AJAX
IN PROGRESS - issue OPENFLEXO-86: docx roundtrip does not worj with new
toc 
https://bugs.openflexo.com/browse/OPENFLEXO-86
MEDIUM: Fixed label views on Windows by disabling double buffering
DB modifications to make help data-driven
Rename help to helparticle
Models, Views, and Controllers to make help DB driven
Fix mobile
Merge branch 'help_db' into v2.0.0708
Make help articles searchable
Merge branch 'help_db' into v2.0.0708
Merge branch 'v2.0.0708' of https://github.com/agoln/FlashVolunteer into v2.0.0708
Don't need conditional in bytes_to_human

Signed-off-by: Andy Grover <agrover@redhat.com>
modified:   globalvars
	modified:   misc/scripts/feat_smooth.sh
	modified:   run_script.sh
continuamos 3 mapCtrl
added taintgraph analysis
update to mobile site! add private-reports2
clean up logs
Merge pull request #1 from alecgorge/mobile

Uses Edline Mobile as opposed to the standard edline
BugFix

Added a "repair permission" function in UserPolicy, Fixed a bug in
course which caused course with 0 reserve to accept reserve
Coverage percentages are proper now.  Should properly match line numbers.
v0.3.1 -> v0.3.2 with ADC fix
integration test setup - remote functions, pom setup. seems to be printing but blocking.
added final processor
Added CTRL-C friendly kill mechanism
Test on pi
Add Listener for OrderedRunnableQueue
Fixed a few bugs
Changed ReadMe
Updated Readme
foo for heroku
gem in ruby gems
refactor the api part
fixed empty wahlkreis in wahlkreise.csv
Add partial object
Adding “.gitignore”.
Fixing “Conversion specifies type 'char *' but the argument has type 'SEL'”.
Fixing “Switch condition has boolean value”.
Updating README.
Merge pull request #5 from JanX2/master

Various fixes for issues with Clang
scaffold lote.
No time to split this into separate commits. Responsive redo and preparing socket id passing
Merge branch 'master' of https://github.com/andrewberls/ideaspot

Conflicts:
	app/views/polls/show.html.erb
Added Accept button to bids partial, update routes
Adding accept route
Complete route
Not sure why these were breaking
Hack to fix accept button
DV: resolving local conflict
Added state change methods to model, added transaction to controller.
DV: Fine tune the lock outs.  This handles the case where the accepted bid is involved in other auctions.
Change state modification methods to use save bang, and validate inclusion on status
Skeleton ability to accept an offer and indication of acceptance
Explicity set response status to open before saving.
DV: updating how responses are saved so state validates
Simple local directory image upload
Validate the attachment a bit
OK, brakeman works
Working S3 upload
Merge branch 'master' into sj_karma

Conflicts:
	app/views/offers/_bid.html.erb
	app/views/offers/_offer.html.erb
	db/schema.rb
3.Karma - Minor change to layout.
osd: Add check for shader subroutine in OsdGlslKernelDispatcher

Print out an error message and some diagnostics.
firehose 0.1 compatability

Remove reference to ::Firehose::Rack::ConsumerApp
compatability. This forces the use of ::Firehose::Rack::App
meaning PUT is always enabled.
boleto security
Deleted file _header.html.erb.orig
maximum phonebook import is 400 contacts per upload
Added .gitignore file with contents "/bin"
Set up custom checkbox
Set proper task checkbox functionality
remove docs theme from devconnect make file
Merge branch '7.x-1.x' of github.com:apigee/apigee-drupal into 7.x-1.x
Init db function
china second commmit
Change update_attribute to update_column to eliminate deprecation warnings
Get Mongoid working by aliasing update_attribute with update_column on Revocable models.  May want to refactor to a more ActiveRecord/Mongoid neutral approach in the future.
Merge pull request #120 from petergoldstein/feature/update_attribute_to_update_column

Replacing update_attribute with update_column to eliminate deprecation warnings
deploy, when running jenkins, force the update_ve to be completely recreated
добавил параметр visitMode для режимов вкладки Работа с пациентом - новый визит, продолжение визита, не визит
Criação das páginas sobre o produto conteudo;
Criação das páginas sobre o produto email;
Criação das páginas sobre o produto web;
Удален неиспользуемый файл