labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'collab'

* collab:
  remove a note in package checker
  bump version
  Fix mad2 method for large data
  bug fix in TrioSetListLD constructor when featureData is passed
  joint4 and computeBayesFactor functions/methods have ... argument that is passed to viterbi2Wrapper.
  put if(is.ff) on one line

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MinimumDistance@64614 bc3139a8-67e5-0310-9ffc-ced21a209358
first version bump prior to creating 2.10 branch

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MinimumDistance@64678 bc3139a8-67e5-0310-9ffc-ced21a209358
bumped version numbers after creating 2.10 branch

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MinimumDistance@64680 bc3139a8-67e5-0310-9ffc-ced21a209358
Some cleanup
Removed old code
Added support for loading external PythonScript

 * Only file:// URLs supported right now
 * pages/my-pythonscript-page.html renamed to pages/index.html
 * pyqtbrowser is not a package
 * added pyqtbrowser.placeholders module to prevent IDEs from showing
   failed import errors
 * All the PythonScript from pages/index.html moved to pages/index.py
Add more content about logomark and logotype
HW1 with rb
fix view
fix session to handle history
Octopress init
Site updated at 2012-05-17 17:46:53 UTC
more explicit attachment message
more on replica package
Merge branch 'master' of github.com:saga-project/saga-python
* Добавлен шифр FEAL
* Пофикшена бага, при которой вероятность 1 в старших битах случайного числа была выше, чем положено
* Проведены дальнейшие исследования
asdf
test
minor changes
Update tst_avdejtesttest.cpp
Add columns to public section
Clears canvas image between each session (woops)
Crosshair for drawing
Better, faster method for saving images
apply recent changes to all pages needing them
manual page update
Removido campo full publisher name
Merge branch 'master' of github.com:scieloorg/SciELO-Manager into tk258
Merge pull request #229 from jamilatta/tk258

Tk258
Abstracted out SingleTableMapper.
check for connectivity in increasing time intervals
rename utils.php to mustache.php since that's all it contains
introduce P2P_Tools_Page and move maybe_install() there. see #64
FuelPHP 1.2.1
New custom theme. Still need some work.
Added the docstring post
Configure recipe to deploy php5-fpm
munin-node: add service and tmpfile
rsyncd: add service
Problem 1. C++ sources
folder lib is required
Separation of files.

Moved sequence analyzing functions to sequID.js
Leitura de PH
bumping self-toasting submodule to 0.6.3
add display of tags to the list of POI info activity
stylingstuff
Removed regions from the rest of the files, updated Resharper.DotSettings.

Small formatting changes to xaml.
support for new ADialog
support for new ADialog
Fixed wording and added documentation.
Revert "rm read me"

This reverts commit e4ac2ee4ea66b0d8581e72cfcb2ebb46af87df9e.
Updated views
Merge branch 'master' of http://github.com/sherrywong/NERSC-Project
with capital letter password in settings
\prechaptername and \postchaptername are added.
arduino sample program link
Updating before forking
Updating before forking, for real this time
Added Facebook patch for iOS, assets patch for Android
Removed test files to have a clean repo
added copy_assets_into_iphone_build def and call in builder.py for iphone
added assets ton ignoreDirs in compiler.py for iphone

added copy_assets_into_iphone_build def and call in builder.py for iphone
added assets to ignoreDirs in compiler.py for iphone
Merge branch '2_1_3' into 2_1_X
Use LinkedIn Instead of Stack Overflow Careers
Update link to addon
Add readme.md

A test of markdown file format
ck-editor laitettu toimimaan viimeinkin
Merge pull request #1 from skurfer/master

general improvements and updates for 64bit
updated handle message function
Changes to get virtualenv.el to work with emacs24.

`python-shell' got replaced with `run-python' it seems like.
Apparently I still don't understand deferreds.
plugin.tests eingeführt.

Signed-off-by: Christian Trutz <christian.trutz@gmail.com>
Adds bootstrap main method runner
removed duplicate file entries
Add kryo-debug-2.20 dependency
Fixed lots of small style errors: spacing, tabs, newlines, etc...
APT 25: Step 1: Added the help.html file and assets folder
APT 25: Step 2: Create a Help Activity

Created a HelpPage.java activity and also a help.xml layout file for that
activity. Currently it loads the html file from the previous commit.
APT 25: Step 3: Splice in the Help Activity

Added Help option to options menu.
APT 27: Step 3: Add a RingtonePreference

Skipped Steps 1 & 2, because I'm using an actual device. Added a
RingtonePreference to the preferences.xml file. Allows choosing of
ringtone for the alarm.
APT 27: Step 4: Play the Ringtone... with the Notification

Added a check to OnAlarmReceiver to catch whether alarm_ringtone
preference is selected and then play the selected sound.
APT 27: Step 5: Play the Ringtone... with the Activity

Changed AlarmActivity to play the notification on a full screen
notification. Pauses when exited.
APT 28: Step 1: Add a Phone Number to the Database Schema

Did exactly what it says above. Also changed the schema version.
APT 28: Step 2: Intelligently Handle Database Updates

Update the database.
APT 28: Step 3: Add Phone Number Support to the Rest of the Helper

Added phone to all the methods that update and add to the database. Also
added getter for Phone.
APT 28: Step 4: Collect the Phone Number on the Detail Form

Added the text fields for phone into all the layouts and java
files. The application only works when choosing new. I could
not access my database to figure out what was wrong so I left it
as is.
APT 28: Step 5: Ask for Permission to Make Calls

Added use stuff to Manifest, to allow for calling.
APT 28: Step 6: See If We Have Telephony

Added method to determine if the hardware is a phone or not.
APT 28: Step 7: Dial the Number

Set up an option to call, from DetailForm. Only enables if the device
is a telephone. Couldn't test this part, I do not have an android phone.
APT 28: Step asdjklasdfljk: Application will not work.

I've been back through every part of this tutorial. I am not doing
anything wrong. The database is screwed up somehow and I cannot fix it. I
can't even get it off the freaking tablet to read it. I cannot access the
database in any way to see what is wrong. Nothing on the internet has
worked, the thing Trevor posted also will not work. I'm sick of this
freaking database junk screwing up on me.
APT 21: Step 1: Find an App Widget Background and Some Icons

Added widget background 9 frame, and 2 icons
APT 21: Step 2: Design the App Widget Layout

Defined a layout for the widget to hold the text and imagebutton to select a restaurant.
APT 21: Step 3: Add an (Empty) AppWidgetProvider

Added a class AppWidget to give base implementation of the widget.
APT 21: Step 4: Add the Widget Metadata

Added a widget_provider xml file to provide extra info that can't be put in the manifest like widget size, refresh rate, and layout xml file.
APT 21: Step 5: Update the Manifest

Added a receiver, intent-filter with action, and meta-data element for the widget.
APT 21: Step 6: Delegate to an IntentService

Call startService on IntentService so that grabbing a restaurant doesn't slow down the UI thread
APT 21: Step 7: Show a Random Restaurant

Added a WidgetService class that rotates through random restaurants in the widget, also edited a few string resources, one for if there is an empty set of restuarants.
Also added the WidgetService to the manifest and fixed a few problems with my detail_form layout and how the notes and feed fields were resolving the layout.
write some idea
added piwik include, refs
created dev/live configurations
fixing dev config url
css: style: responsive edits to text body, headers
css: style: more responsive edits to text bodies, headers
responsive menu integration
scripts: removed widont for headers
initial menu, full text width for small res
Fixed missing-function error in caterwaul.core.js
README updates
Fix file references. Now the remaining errors are in the Javascript itself.
Improve formatting of CHANGELOG.md
SPL-48570, properly handling mixed/upper case usernames - Splunk lowercases all username intereactions, so we had a few more places to fixup for the SDK to work properly.
Updates to some twitted sample files.
Merge branch 'feature/caching' into develop
Editing the account
[TIMOB-9085] Remove unnecessary code.
Added: Arduino communication using serialport gem

> Simple sentences-based actions & callbacks between an Arduino device
and the Siriproxy plugin i made
Add initial support for listing goodbad messages by user.
Merge branch 'master' of github.com:gabeguz/hubot-scripts into usersupport
MOAR GOB. :v:
adding the ability to greet you like warren ellis would if you were in one of his comics
Add HUBOT_GITHUB_USER env variable to configuration. Delete unneeded variable 'oauth'.
adding more profile info to coderwall.coffee
Merge pull request #482 from bobwilliams/master

Sending pull request for coderwall.coffee update
Trac Hubot-Script

Fix issues with variables used but not valid
Merge pull request #484 from CedricGatay/fix/trac

Trac Hubot-Script
Added a 'describe' action for the jenkins script.
Slightly improved output formatting.
Merge pull request #473 from dylanegan/moar-gob

MOAR GOB. :v:
Merge pull request #475 from rafael/master

Issue with acitvity script.
Update FYN providers

Abstraction, and better string escaping.
Silly, I didn't need a Node module
Merge pull request #486 from amco/fuck_yeah_updates

Update FYN providers
Merge pull request #485 from chriskchew/jenkins-describe

Added a "Jenkins describe" action
Latest version of goodbad.
Merge pull request #488 from gabeguz/master

Teach goodbad about users.
Added Willy Wonka and Bad Time Ski Instructor
Charset no need to save :-(
link to readable-stream in the future section
note about data types
text
new text
Pic for the 'quickhack' article.
One quick hack:)
remove old rule
make header stick to top of screen
renamed summary to excerpt in favor of jekyll docs
ATゲージ実装中
HPを文字列表示の実装
敵のHP数値表示を実装
ATゲージの光らせ方を修正
ATゲージの増やし方調整
ATゲージをダメージ時に減少させるようにした
HPゲージを非表示にした
お邪魔ブロック落下を実装
tooltip early sketch
adding MIDI echo
Set custom error
Started to add the alias mechanism.
It is now possible to add and list aliases already.
Reinstate account tab selecting javascript
contracts ui almost finished
Update Deferred/src/Deferred.js
ITP-248: Separate javascripts, fix Chrome rendering, enforce signed in user for presentations
alternating lines are colored differently
print french text to console on click
added more lines to learn
footer and pagination fix
I am not a graphics designer
disable initalize_on_precompile, maybe this will fix heroku?
added alert in config.js for redactor to test if config is getting pushed
trying to include assets, maybe that will fix heroku problems
remove public assets, add alert to projects.js for testing
removed redactor from code
fixes #1708 create site.pp even if empty
Update manifests/server/config.pp

Reference bug tickets puppet and foreman.
Don't replace existing a site.pp
Merge pull request #17 from sgzijl/1708-add_missing-sitepp

Create site.pp even if empty
changed zendframework dependency to zend´s composer repo
Connection shows tables!
Add a HTML page showing the FAMFAMFAM flag icons
Site updated at 2012-11-18 10:21:31 UTC
Standardize setup/teardown
cleaning lady
rename setup and teardown
test cases
stone mason
power
move things from the life book repository
add support for radio elements
Pretty up Recently Played widget on dashboard a bit by making played time/playee gray text
Automatic merge of Transifex translations
* While not a bug, this shutdown check would have never been triggered.
* Init Database earlier.
* Mutex protect logging.
* Updated breakpad to latest version.
* Fixed compiling on OSX.
* Fixed Windows includes.
* Fixed OSX linking.
Add ChangeLog entries
* Style cleanup.
* Fixed compiling on Windows. I hope.
Automatic merge of Transifex translations
* Temporary fix for compiling madness.
* Don't show resolver errors when built with RelWithDebInfo.
* Respond to pings from external resolver.
* No need to manuall set fake query's results.
* Re-center play/pause buttons when resizing GridView.
* Make sure script-resolvers are executable before trying to execute them.
* Don't reset current viewpage when the new page is the same as the current one.
* Automatically adjust crash-reporter's window size.
Updated filters for cards from cards.xml
Fixed errors thrown for null types
Tests to use test GPG keys
I've edited the makefile to create a test GPG key and to
also create a "test" GPG home directory. This allows the
tests to be run using the test key instead of the users
key.
Python-gnupg 0.2.9 & Plinth are now downloaded and added
to build folder and scripts updated to include this path
in PYTHONPATH.

Python-routes and python-socksipy are installed through
makefile.
add $(TARGET_PRODUCT) to cm.version
add a new post about the subject of the blog
[TRKLGR-24] Updated data provider to support cascading delete.  Simplified common actions in the activities and added delete operation for sessions.
configure sidekiq to use Travis.config.redis.url
Changed storedRecs to Set
Added Col.isDirty.
Various fixes for ibookng
Improved support for Rec deletes.
Changing formatting of results again
creating log dir if it isnt there
Fix rare libcdio bugs on certain platforms.

Adjust tracksplit, cd2track unit tests for new syntax.

Add deprecation notices to the old FreeDB/Musicbrainz routines.
Reorganize APEv2 tag handling.

Remove the tag_length attribute and calculate tag size at
update_metadata/delete_metadata time rather than trust
that the value in the object is correct.

Update set_metadata() routine to keep cuesheets
with their current files rather than port them.
Add long file detection to AIFF/Sun AU.

These now fail properly when the data size gets too large
rather than overflow.
Update files for PEP8 compliance.

This is mostly just formatting them for consistency
with the rest of the Python world.
Adjust reference documentation page breaking for consistency.

Fix a lot of reference figures for consistent capitalization.
Add unit tests for FLAC seektable cleaning routines.
Overhaul method for building .wav files from chunks.

Using a simple chunking interface makes it much easier to modify .wav
files on a chunk-by-chunk basis.

In addition, this makes it possible to have FLAC files with
foreign RIFF chunks to build .wav files without having
to decode the entire FLAC to temporary space.
Convert .wav, .aiff and .flac to use the new chunk interface.

The idea is that chunks implement a handful of methods
so that a .wav or .aiff file can be built from them.
This allows very large chunks (like wav "data" chunks)
to be kept on disk while very small ones are stored in memory
without file generators having to know the difference.

As a side benefit, FLAC can use the same interface
to avoid storing all its PCM data in memory.
Fix numerous lossless format bugs exposed by the unit tests.
adding cont version launch
on node, reflect.js now properly exports functions to module interface
Documented the Security Token "gotcha" and tried to make the phrasing more platform independent.
"We" aren't doing it, "you" are.
Mentioning the security token "gotcha", minor rephrasing.
Merge pull request #16 from TMcManus/master

Clarified the install process
Preparing for Nicks code
retrying
Merge branch 'master' of https://github.com/vaibhavpuri2208/facebook
pushing additional functionality
Fix issues on display
Merge branch 'master' of github.com:valerian/meetadvisor-app
fixed eclipse problem
db functions updated to the new D7 database op syntax
Site updated at 2012-03-30 17:15:34 UTC
Populated about dialog panes. Closes #108
Fix certificate loading on OS X
Merge pull request #4 from luite/master

Fix certificate on OS X
edit hope post
Version 0.6.36
Incrementing version
Adding cookies to information page
Funcionalidad eliminar bebidas lista - Error al cambiar entre bebidas y platos
"visited" column is added to TestDataGenerator.java
[opencl] 3.3 review done

Signed-off-by: Ni Qingliang <niqingliang2003@tom.com>
[opencl] 5.4.3 done

Signed-off-by: Ni Qingliang <niqingliang2003@tom.com>
[opencl] 5.4.4 done
Updated timeout
Merge branch 'master' of github.com:wardbekker/ci_quickstart
Prepend ns. rather than append .ns
- failed dataScroller
- successful scrolling
- customer form are ready.
- version 1.0.4 scrolling form
images: Build 201211161956 of webos 1.0 for machine qemux86 on borabora
packages: Build 201211161956 of webos 1.0 for machine qemux86 on borabora
Updates XMPP to use the new test module.

Jira issue: WP-573
Merge pull request #340 from eelcocramer/wp-423-mutual-auth

Updates XMPP to use the new test module.
Change the theme back to dark, new buttons, add favicon, style xdebug messages
Explicit conversion to v4l2_ctrl_type
Fix typo in pkgconfig
Update to 0.1.4
+ Creating debian mods for distro: precise, rosdistro: fuerte, upstream version: 0.1.4
+ Creating debian mods for distro: oneiric, rosdistro: fuerte, upstream version: 0.1.4
+ Creating debian mods for distro: lucid, rosdistro: fuerte, upstream version: 0.1.4
PV and CV as default values
Find a PC rollback

Rolledback changes to Find a PC, not pulling data correctly.
Removed AVT from list of current groups.
added small query parser
Remove chunking
Cleanup code
[JobQueue] Abstracted nextJobDB.php to not assume JobQueueDB.

* Changed the use of caching to avoid cache slams by having runners
  fall back to the old "queues with jobs" cache value when another
  process is updating the cache. Also bumped the cache key version.

Change-Id: I6d5f32ab846c14a25afe8c5957443ed95a1d7bd2
Revert "(bug 42337) Simplify "my talk" link logic in personal tools"

For 2 reasons:
* The parentheses look (according to CologneBlue) weird in skins others than Monobook and Vector (where they are bulleted lists)
* The parentheses look (according to Krinkle) weird in Vector and Monobook as well.
* The casing changed from (talk) to (Talk), which is odd.

Please try again.

This reverts commit f31209dfb307ec2bac20107e788578b762f70e89
Merge "Revert "(bug 42337) Simplify "my talk" link logic in personal tools""
Fixed consent form date
Site updated at 2012-07-26 23:35:28 UTC
add awesome resource
Add bundles to .vimrc
update README to use ccache
Site updated at 2012-12-18 14:29:01 UTC
Merge branch 'dev' of http://github.com/BaiduFE/Tangram-base into dev
删除框架中对Tangram1.3.9的引用
添加针对swf.create的bugfix的用例

[Testcase]添加针对swf.create的bugfix的用例
swf.create: 添加不传target的情况的用例
swf.create函数BUG修复
[Bugfix] 在create时候调用document.write页面内容会被清空
baidu.swf.create：使用baidu.dom.insertHTML代替原有的document.write插入操作。
Merge pull request #271 from tianlili/dev

Dev
针对page.load的bugfix更新用例

[Testcase]针对page.load的bugfix更新用例
page.load：针对xxx.js?abc取不到扩展名的问题添加用例
Merge pull request #272 from tianlili/dev

针对page.load的bugfix更新用例
Merge pull request #273 from xiadengping/dev

Dev
Merge pull request #274 from webooxx/dev

swf.create函数BUG修复
[update] modify some jsdoc
Merge pull request #275 from ChineseDron/dev

[update] modify some jsdoc
暂时移除TRunner
by mm

[bugfixed] baidu/global/getZIndex.js
提交1.5.0.0 release文件
Merge pull request #277 from tianlili/dev

Dev
update for build run
Merge pull request #278 from bellcliff/dev

update for build run
更新构建脚本

[test] 因执行超时导致构建失败
WHERE : release/build_run.xml
更新脚本中关于报告的等待时间为30分钟
更新构建脚本等待时间单位

[test] 因执行超时导致构建失败
WHERE : release/build_run.xml
更新脚本中关于报告的等待时间单位为分钟
Merge pull request #279 from bellcliff/dev

更新构建脚本
menu work started
Fixed Markdown link in README

Signed-off-by: Christian Romney <cromney@pointslope.com>
fixed unicode encoding bug; restores tweet if status update failes
there is an error in the script producing the file see purple3 passes to
Site updated at 2012-12-16 10:46:00 UTC
github pages
fixed example
example fix
many1
merge gh-pages
modified:   404.html
	modified:   _includes/themes/north/default.html
	modified:   _includes/themes/north/post.html
	new file:   about.html
	modified:   assets/themes/north/style.css
ㅇㅇ

업데이트 받으려는데 커밋하라는데 뭐가 바뀐건지 모르겠음
build dependency in README
Use square instead of triangle
advisor + couple other changes
updated xchemes for Xcode 4.3.2
Texture2D: Do not use RGBA888 when no alpha

Instead use RGB565 like in v1.1.
RGB888 textures, internally, are expanded into 32-bit textures
Site updated at 2012-11-06 06:44:26 UTC
Fixed some things, but may have broken something else
sep 10 2012
Add apps 207420, 207350, 31410, 220820
Skip GPG signing
[maven-release-plugin] prepare release maven-nar-plugin-2.1
[maven-release-plugin] rollback the release of maven-nar-plugin-2.1
Product Unit Tests
Fixed bug with double quotes
Replace os.removedirs by shutil.rmtree because it can remove non
empty directories.
Facebook & website werry aangepast
Updated Gold/index.html to place '-- or --' inbetween the #additem Display and Clear Links.
........
Merge
OPEN SCREEN START
added tracking box
Added Whenever to the gemfile
Use a github url that can be used for both web viewing and git cloning.
fancy program
antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fixed most incompatabilities with antiqua.dmm (exception being disposals sorting junctions)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2030 from caelaislinn/mapfix

Antiqua mapfixes
ZAS bugfixes.

Signed-off-by: unknown <Colm@Blue.(none)>
Merge pull request #690 from Mloc/zas

ZAS bugfixes.
Fixes robolimbs surgery.
TG: RIG helmets can now be used as flashlights, just like hardhats. Credit to Sly
for the sprites.
Revision: r3638
Author: 	 ericgfw...@hotmail.com
TG: The cbeck antags verb now logs correctly.
Revision: r3639
Author: 	 petethegoat
TG: -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new
Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi,
respectively.
-Driest Martinis will no longer be invisible.
-Braincakes are now able to be cut into slices.
Revision: r3641
Author: 	 d_h2...@yahoo.com
TG: Added Atmos glass doors.
Revision: r3642
Author: 	 ericgfw...@hotmail.com
TG: -Medical borg overhaul. Instead of a dozen random one-use pills and syringes,
they get an advanced hypospray that can switch between auto-replenishing
tricordrazine, inprovaline, and spaceacillin.
-Janitorborgs get a mop again, because without it they had no way of hitting
anything.
Revision: r3644
Author: 	 d_h2...@yahoo.com
HUD Update

TG: - User interface updates.
Revision: r3646
Author: 	 baloh.matevz

TG: - Added a character setup option which allows you to pick between the Midnight,
Orange and Old icon sets for the user interface.
- Deleted most of the unneeded icons from screen1_Midnight.dmi Use that as the
reference for making new icon sets.
Revision: r3647
Author: 	 baloh.matevz
More people to the whitelist.
Changelog and credits.
Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	html/changelog.html
Merge pull request #1152 from Erthilo/master

TG Updates + HUD Updates + Alien Whitelisting
Fixed: Link details shows stale data after submitting edit form.
Fixed: Links page was sending page URL query var that we don't use.
Fixed: Transparency issue with GD image resizing.
Changed: Attachment thumbnails are now resized to shortest size and cropped into the final dimensions requested.
Changed: Require GD 2.0 support in image_resize_gd.
Removed margin from h3 on predictor
Added file changes.
git-svn-id: http://dwlab.googlecode.com/svn/trunk@273 1f63a6fe-6007-92bf-7612-2633ac8b7beb
* Moved storage of configuration to use a single JSON string in
SharedPreferences
* Fixed some problems
* Added a dialog at first start
first step four
Added keyboard handling code bits.
almost fixed jumping, fixed sprites
stuff
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
stuff
you better

Signed-off-by: JPBarker <joseph1.barker1@gmail.com>
Cursor works again.

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
menu's are good.
cursor changes
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault

Conflicts:
	armored assault/Source/AnimationManager.cpp
	armored assault/Source/GamePlayState.cpp
stuff
Fixed Particle Tool
Merge branch 'master' into menucursorwork
commit so i can switch branches
Player bullets collide and destroy on contact with enemy.

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
???
Collision altered to be based on anchor point
Merge branch 'Jonathan-Work'
updates.

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
Merge branch 'rob_testing'
Enemy gets removed after hp <= 0

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
added images
weapon changes, and HUD images

Signed-off-by: JPBarker <joseph1.barker1@gmail.com>
773 - Daily Digest - Only show Petition Text once - show all signatures as the intro.
(fast) leeres template hinzugefügt
select.mk: Tune ccache options

With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Merge "select.mk: Tune ccache options" into jellybean
Get sub-mm accurarcy
Added drag and drop + minified version
Added pre 1.6 importer, needs testing but it worked for me locally
a few small class changes
Added description and elapsed time.
Start better cleanup than last time.
Updated server recipe with all the templates I believe I currently have
Make the doc better
Add all Spring.NET dependencies - and NH3.2 via Spring.NET Data/NH32 support - to the set of things under NuGet management.
paypal button not glowing anymore
Morlock is now Maggot Master
fixed g+ page link
Added scripts for tokenization, lm classification, and text to feature vector conversion.
Version 0.9.2
Merge branch 'hotfix'
add solution links
Remove super verbose NAT logging
Merge branch 'master' of git://github.com/HOLOGRAPHICpizza/GridToGo
Fix crash when hosting region.

Distribution does not have (nor should have) access to the client.
Instead, take the externalhost in the constructor.

Defaults to localhost to not break test code.
More fixes. Refs #31
Better format for process logging.

Tag all process output as [PROCESS] [PROCESS-NAME]. This allows the log
to show the output of different commands with a grep easily.

Fixes #32.
Updated frontpage images and added active links
Attempt to fix some scaling artefacts in the new icons.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5049 b64f7644-9d1e-0410-96f1-a4d463321fa5
Rejig the gfx folder.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5050 b64f7644-9d1e-0410-96f1-a4d463321fa5
Added 2 missing image files

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5051 b64f7644-9d1e-0410-96f1-a4d463321fa5
Another scaling artefact fix.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5052 b64f7644-9d1e-0410-96f1-a4d463321fa5
0.11.1.112

- Изменены некоторые комментарии.

Ошибки:
- При регистрации и востановлении пароля письмо на указанный адрес не отправляется. Реализовать как только появитсья возможность работть с smtp-сервером.
Base files
Here we go
Fixed one div, made one field editable
From Dream server
Merge pull request #1 from HeadlessMonkeyman/develop

Develop
build_script change
stand-hotplug: Support tegrak second core app
added the logo to the top left corner
Debug stuff, plus fixing tutorial trigger
increased width of .views-row class
updating sprite generation from sass
[MapEditor] Added fallback in case a image could not be loaded
[MapEditor] Fixed switch of x and y coordinates when saving

This error caused editor crashes in case maps with different height and width values were saved.
[Client] Cleanup text before sending it to the server
Changes to data model
Reset it to a working state
All aspects functional except edit/delete item (because it's on seperate page, need to sort that out"
Add if, for loop, def
slkdjfl;sdjf;sdf
LPS-29556
LPS-29523 - Minor visual fix for LPS-25683
LPS-29527 Use RenderRequest locale to get the portlet title
LPS-29558 Add index to PortalPreferences table during upgrade
Line break
LPS-29219 In IE7, buffer.join() pushes delimeter even when it is undefined
LPS-29219 - Source formatting
LPS-27951 Password policy page has visual inconsistancies
LPS-29563 ProcessOutputStream should do explictly synchronizing on ProcessCallable outputing
LPS-29520 Sub-process attaching needs to happen under system classloader
LPS-29520 Source formatting
LPS-29560 Change ReCaptcha to reCAPTCHA to keep consistent with the reCAPTCHA official site
LPS-29560 Also capitalize all cases of CAPTHCA
LPS-29560 automate fix
LPS-29560 regenerate
Merge branch 'master' of github.com:liferay/liferay-portal
Add events, news and fb-like-button addons
Uploaded logout
Minor updates to clean up images folder

After requesting if I could use the images for the brands in the wimba
I added /cleaned the directory
fluidsynth - use default presetlist buffer size if not available as an option
disabled some Android.mk files and reverted resume fix
sometimes you just can't use jquery....
Update src/to/joe/j2mc/admintoolkit/command/MobCommand.java
评测页面优化，提供数据下载
小于号修复
BDSDKExample.
Add UTF8 encoding
compiled on Quartus 12 by Ricky. Added git version information for future reference
kernel.txt is also generated from build process
Merge branch 'master' of github.com:Lophilo/firmware-binaries
Merge branch 'master' of github.com:Lophilo/firmware-binaries
Added exception catching to Ogg loading.
Stable enough.
Stable enough.
Added some item hooks, better extension method, docs update
More stuff
removed a bunch of unnecessary files
updated git ignore so that more save files are ignored
renamed action according to packagenames
Fixed 0003757: Expand shutdown menu with "Restart MediaPortal" and "Exit MediaPortal" choices
Added missing language strings
Add missing ReSharper files
Fix FilterChecker DVBSub2 error.
Update DRC settings for 1.3.0Beta.
Minor Tweak in PAL refresh.
Merge remote-tracking branch 'remotes/origin/BUG-3886_Add_missing_ReSharper_files'
Merge remote-tracking branch 'remotes/origin/BUG-3901-Update_DRC_settings_for_1.3.0Beta'
Merge remote-tracking branch 'remotes/origin/BUG3888_Fix_FilterChecker_DVBSub2_error'
Merge remote-tracking branch 'remotes/origin/FEAT-3757-Expand_shutdown_menu_with_Restart_and_Exit_choices'

Conflicts:
	mediaportal/MediaPortal.Base/language/strings_en.xml
Modification on Installer for the client part :
It install/Unisntall shorcut on desktop / start menu / bin in Program Files\Team MediaPortal\MediaPortal TV Server\SetupTV / copy TuningDetail.
fixed logging, error logging with exceptions as parameter were not properly logged
fixed log4net configuration (duplicate, absent error.log)
v673 - locking changes (it looks like the WorkerThread can be stalled in the EVR Mixer when OnClockStart etc are called, creating a deadlock when attempting to lock the WorkerThread)
Fixed GetDirectoryName for chained resource paths
Fixed exception formatting
Fixed online matching
Fixed NfoReader to work with chained ResourcePaths
Portfolio selection skinning
Portfolio selection skinning
Removed old, unused code

- Removed Time parsing libraries that weren't actually
  written by the ModelSEED

- Removed ObjectManager and PersistenceAPI (and tests).

- Added Time::ParseDate to dependences (actual module)
Added function to print excel format in Model Driver, and adding readble printing to base moose object.
Fixed issue where the main window would not respond while the
find/replace dialog was active.
Add JSON parsing.

- Method to make HTTP connection, initiate request using parameters, and parse received JSON format data into dictionary object.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
made ofsted data more explanatory
Synchronized cancel, fixes a race issue where url connection delegates were called after the operation is cancelled
Merge branch 'master' of github.com:MugunthKumar/MKNetworkKit
Moved flattenArray to be a private function outside of $.object.flatten.
Renamed flattenArray to _flattenArray

Signed-off-by: Jason DiMeo <jason.dimeo@gmail.com>
Addition of surface timers and removal of tileset managment.

So, what I've done, is that I've removed the tileset management, and
replaced it with something more general: surface timers! These function
extremely well, as NO graphics load on startup, and they are only loaded
as and if they are needed. After 10 seconds of not being used, they'll
be unloaded, allowing you to be sparing on memory, and there is never a
noticable loading lag spike!
removed unnecessary code, changed perms around
updating README
fixed invalid method signature breaking build

fixes build #108
Adding a new view to handle teachers
modified the git ignore file.
GCS - UAVTalkRelay Fixed dependencies and pluginspec project name.
added clear IE cache
Core/Spells: SPELL_EFFECT_ADD_COMBO_POINTS should be only handled on SPELL_EFFECT_HANDLE_HIT_TARGET (thanks to OneB1t for the hint).
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Core/Spells: Some Adjustments from the last pull request.
+ added geolocation
Again!
Again!
No more parent to right chat tab
Added mover for top center datapanel and abaility to be moved.

Signed-off-by: Repooc <repooc@tukui.org>
Richard -- Remove modal.html
添加returning,支持幽灵元素拖动后,原元素不跑到其位置上
添加hoverClass与activeClass参数
更新文档
fix ie fire
添加自动调整宽度与生成结构的支持
added travis status to readme
removed redundant specs
grouped rake under test group
Working scripts, vertical decryption may be trivial
created PDF of talk
ENH: itkEuclideanDistanceLineMetric.txx has been implemented.
ENH: Add forward kinematics and inverse kinematics functions.

Signed-off-by: ayamada <ayamada0614@yahoo.co.jp>
force activeadmin to be pretty
Updated .gitignore for basic MCP use.
Create DRY ex.ToStatusCode() extension method
Debugged remote file list function in bandwidth.py
Partial fix for #7
Fix error in merged project file.
bug fixes
Merge branch 'master' of github.com:SpearThruster/BMT-Weather
bug fixes
Merge branch 'master' of github.com:SpearThruster/BMT-Weather
SQL:
* better filename for sql dump of user table
SQL:
* improve user sql table definition
+ ad userlist sql definition
WIP splitlines
remove JVM shutdown hook
Generalized Twitter Authentication
bug fixes in microcontroller
Manually merged with 1.8.x
VIREO-119: Fixed failing tests
#18 The ordering of committee members appears to be lost on the document
info screen.
#21 Change the definition of "allow multiple"
Don't need that import, nor that suppress annotation.
Mudança de DateTime para LocalDate
adding getUrlsafeIdentifier to ModelManagerInterface to properly distinguish id and id safe for use in database
adjust admin to use the url safe id
Merge pull request #973 from TomAdam/pr-fix-action-button-styling-master

Fix action button styling - master
Merge pull request #968 from dbu/add-urlsafeidentifier

adding getUrlsafeIdentifier to ModelManagerInterface
Update Resources/views/standard_layout.html.twig

Replace p balise by div for user block.
Remove fixed width for admin block on dashboard

The fixed width breaks the dashboard on smaller screen sizes, as it overlaps with any blocks that may be to the right of it.
Fix immutable array template to correctly display multiple fields
Merge pull request #980 from oparadis/fix_immutable

Fix immutable array template to correctly display multiple fields
some phpdoc fixes and improve code view
MenuItem -> ItemInterface
Merge pull request #981 from KonstantinKuklin/master

some fix in phpdocs and use classes
Merge pull request #975 from colinfrei/patch-1

Remove fixed width for admin block on dashboard
Merge pull request #974 from netounet/patch-7

Update Resources/views/standard_layout.html.twig
renamed  translation file to  because PT is the official language. Added the new translated ids and translated them
Enable public fields without getters to be displayed

Enable public fields without getters to be displayed in the list.
Previously, when there was not getter method, the field would not have a value in the list, even if it was public. Forms would still work because they use the Symfony2 Form mechanisms that look for getters first and then for public fields.
fixed filtering on sub-entities for sf 2.1
Add a safe option for template
Fix local autoload
Merge pull request #992 from danielcsgomes/master

Changed `pt_PT` translation file to `pt` and translated the new elements
Merge pull request #993 from mweimerskirch/patch-12

Display public field values in the list
Fixed some warnings

ie unused variables & methods.
Removed comments
Cleanup, added SuppressWarnings(unused)
Added 3 meeting agendas & put them in folders

one folder for each month.
Add more help to the Advanced menu so the testers will have a better idea of how to deal with the config menu.
Kanskje endringer i classpath?
Merge branch 'master' of git@github.com:Ullteppe/Fellesprosjektet.git
Unix/error: need to release keyboard/mouse grab before displaying a dialogue box.
On *nix, use execvp() rather than system() for launching external dialogue box utils.

This avoids shell quoting problems.
Fix build on non-x86.

gcc doesn't have the -msse2 switch on most architectures.
libCPUInfo isn't buildable on anything non-x86.
Don't show pak extra info after startup
added APPLICATION_WORKFLOW to settings

and removed unused settings leftover from django-registration days
[Form] added FormBuilder
When retrieving MMS, continue on with best-effort in absence of APNs.
Responsive list
Bug àlacon #noob
class_type_invalid is not a PrC. Shockingly.
w4 average
Spring security
Spring security
comment in sequencer
Pruned avfilter from swig interface
With multiple predators the episode length no longer is a measure of how well the predators perform: confusion can cause an episode to end. Therefore the confusion/preyCaught rate is also printed. If rate=0 then only consufion has occured, else if rate=1 then only preycaught has occured. EpisodeLengths and EpisodeEndings are written to txt and read plotted in plotAA.m.
set a passenger min servers
add in something to trigger a database update after the install
Enabling oracle java in alternatives
Added a straight up image resolution comparison, no foresight.js but instead has hard coded src values.
build.sh drops aggregate if it exists
Updating the config.js file with exports
fixed google data source
Add compressed data file
Added test to make sure you specify absolute path

and checks if a run already exists in the file to
make it more foolproof in experiment environment.
removing the name "component"
Added support for more than one hosts
Change collectd types
Added todo parsing.  Converted to jQuery.
mass tagging traduzido
consertado conflito em mass tag
Updated README.md
Modified MetaData to Metadata
Refactors delayed_job.init to only wrap delayed_job script
Pass w3c html5 validator
Merge branch 'master' of smeuh.org:smeuhsocial
[TASK] Rename Swiftmailer license exception file

Change-Id: Ia1de8910ee216767dfc286590cb81a5cee9f640f
Resolves: #42422
Releases: 6.0
Reviewed-on: http://review.typo3.org/16683
Reviewed-by: Ernesto Baschny
Tested-by: Ernesto Baschny
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
[TASK] Update SwiftMailer license exception

Change-Id: Ia4c9ec4cb174493810e90d018082a92d37485194
Resolves: #42422
Releases: 6.0
Reviewed-on: http://review.typo3.org/16684
Reviewed-by: Ernesto Baschny
Tested-by: Ernesto Baschny
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
[TASK] Split FLUIDTEMPLATE class to smaller methods

The patch splits the FLUIDTEMPLATE content object to smaller
and more readable code pieces. Additionally, 27 new unit tests
are added for the public API method, checking all important
code areas and documenting current behavior.

Change-Id: I049718a7f00da20534d28353796878310871adf4
Resolves: #43182
Releases: 6.0
Reviewed-on: http://review.typo3.org/16639
Reviewed-by: Helge Funk
Reviewed-by: Stefan Neufeind
Tested-by: Stefan Neufeind
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Mattias Nilsson
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Lots of improvements to message queue & commands

added simpke command, consolidated message queues, added db interface
functionality
setformation
Adiconado arquivos para banco
Adicionado imagens para o catalago
Iniciar codificação
Prototyping OSINT Top 3 Chinese Social Networks
Google Translate - Twitter Trending Topics
更正文字太多會不會向下推擠的問題
award page
toTime method - checking for the type of frames before usage
nnet completed
Adding passlib.
Added CNAME so that domain can be used.
join command plugin
Facebook auth almost configured and ready to go
Enable libnl support.
asd
Attempting to fix bio photo.
Add google doc list api auth type.
123
123
test adding new line
removing build folder from repo and adding a new ignore rule
make Time To Idle and Time To Live configurable
can  be dynamic with ehcache

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1424746 13f79535-47bb-0310-9956-ffa450edef68
add class

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1424747 13f79535-47bb-0310-9956-ffa450edef68
Nelielas izmaiņas ar pārejas efektiem.
Pievienots CNAME ieraksts.
Merge pull request #9 from arvislacis/master

Vārddienis 1.6.2
Fix ButtonRow width
Made some changes in the SimulationTimeStep, however I havn't added the
timestep yet.
trim os name
remove final traces of AsyncCache
fix typo
hook up debug mode to -D
lint and update to _ns
allow usage as module - export configuration
make registry scan work
allow conf use as module too
Issue#5: Implemented start menu.
fix GPMC configuration.  100ns access, async 16bit
styling for the home page
adding the modules html file.
move template suggestion to bangpoundentity.
2012.10.10-11:41
Stuff done at Uni
first three exercises
Scopes correctly working
Fixing a bug with datetime fields losing their values on edit
Started jenks natural breaks implementation
Completed better polygon symbolization routine + legend
Small update
Added host_free_ram
Simple in-process browser that can return Ring's session cookies.
small change to make the example more minimal
Collisions & Map Update

- Implemented new area, new player model and new player animations
(attack and run)
- Implemented a CollisionHandlerPusher() to enforce collisions with area
objects and enemies

- Removed redundant, commented or old code in order to simplify and
clean up
- Misc small fixes, tweaks and optimization attempts
Add space to track what information to show with what nodes
Added transport files
Add licenses
Adding new callback, update ReadMe
Uploading v1.1
Fix problems with array settings for colored images; Make colored images work; Merge flow scripts into a single program
Use Metric package from own repo
finally true
Added authentication and intro page
Fix failing tests in ManagedRepositoryITest
Using canvas' toDataURL function to produce an image from the canvas QR code.
merging changes from temp
leaderboard support
Add memory store to CI.
Dropping back to gwt rc1
added title option; better series header positioning for 2-series datasets
creating demo files
added 3rd demo
added decimalPlaces option
added omitInteriorLabels option
cleaning up some header positioning logic
wire-based version, with a simple atomize wire plugin, just to prove the idea
Updated atomize-wire to provide a transactional facet for easy transactions. Click the button and watch the value
Update README
Add revision sha as id value for timestamps
Force revisions to be strings for JavaScript array

- Remove unneeded print statement
- Remove unneeded code comments for blame parsing
Add toggleable xray controls and typeahead sha search

Fix navbar to top of document
Ensure navbar does not obscure typehead search results

Fixes #31
Add goToCommit() function for navigating to a given commit

- Refactor JavaScript to encapsulate all functions into a timeline
object
- Move the "revision" identifier to <td> elements in the HTML
Tweak images, load DB "before".
added the plugin, an index and tests
gitignore
changed name of the main; updated makefile
Ajout de la possibilité de ne pas indexer un certain type d'extension
Removed greps in main blob code and touch in IsBlocked()
Version 0.2.22
Removed incorrect text when running calabash-anroid gen.
Removed .DS_Store file
Updated hooks
First attempt at a calabash-android where there user won't have to rebuild the test server.

A compiled test server will now come as part of the gem but without a valid manifest and signature.
The manifest and signature is created where we would usually build the test server.

My hope is that this will reduce the friction to get started with calabash-android.
New method for resolving ids
Added challenge #8!
Merge branch 'gh-pages' of github.com:callumacrae/regex-tuesday into gh-pages
Bugfix for qlearning
Backwards compatible instanceid didn't work.
Exception caught on metadata failure.
Slow handling of case credentials not in app settings.
Previous commit: Exception handled after main request task.
Updateding the code to show the name.  Also adding the ignore
add append pid to generated path
fixup project layout for mvn
fixup dependencies
Ruxcby core and Ruxcby Xinerama modules done
Make the update in a separate thread so that github stops dinging us for being too slow.
Adding an idea for a forking background worker to get past the Thread queue sometimes blocking bug.
Use the actual author of the submodule's change as the commiter, so that CI and other messages will point to the real person.
Have not been able to get the Spec runner to actually pass, but it does work in production.
console icon
Added static pages (home, help) via ruby generate controller StaticPages
Added static pages (home, help) via ruby generate controller StaticPages (FIX: Added some files that were missing)
Added Somewhere Dynamic Titles & Started using application.html.erb as the master template
Added Somewhere Dynamic Titles & Started using application.html.erb as the master template
Added some additional .gitignores and static_pages controller with home/about/help
ignore some files in .idea folder
Preparing to merge master > static-pages branch
Still trying to get merge between master -> static-pages to work
Merge branch 'static-pages'

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
removed duplicate getAllQuizAttempt function from AccountUtil since there is already one in AttemptsManager
Will not add port listener if it has a parent module
[xorg-x11-drv-nvidia] Fix a couple of mistakes
Fix typo in README.md

I fixed the wrong plugin name.
Merge pull request #1 from nobu-k/patch-1

Fix typo in README.md
Fixing ls aliases for mac.
rubygems version changed to 1.6.2
First pass at XML parsing

Pretty sure this doesn't work yet though.  Commiting for posterity.
Removing this terrible Henry IV pt 1 input

It has some major flaws, among them being all lower case, and weird
changed words ne'er->neer
Commiting new Shakespeare working set

These look very promising.
Some fixes to XML parsing

The new input we have apparently includes quotation marks around any
number of things, and I've opted to strip them all out.
added more permgen space to server startup script
Updating RDF->XML converter- language element
Debugging xmpp
Reverting xmpp debugging
Invert hightlighting colors: normal background gray, hover background white.